31 files changed, 81884 insertions, 41778 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f58bc8a8..11f2e94f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-25  Werner Koch  <[email protected]>
+
+	Released 1.9.90.
+
 2006-09-22  Werner Koch  <[email protected]>
 
 	* AUTHORS: Add information about used licenses.
diff --git a/NEWS b/NEWS
index 6896fd3f4..f5f903ef3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,12 @@
-Noteworthy changes in version 1.9.90
+Noteworthy changes in version 1.9.90 (2006-09-25)
 -------------------------------------------------
 
  * Made readline work for gpg.
 
  * Cleanups und minor bug fixes.
 
+ * Included translations from gnupg 1.4.5.
+
 
 Noteworthy changes in version 1.9.23 (2006-09-18)
 -------------------------------------------------
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index b3be057c5..1adf8ba94 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -2864,8 +2864,8 @@ start_command_handler_ssh (int sock_client)
   if (ret)
     {
       err = gpg_error_from_syserror ();
-      log_error (_("failed to disable buffering "
-                   "on socket stream: %s\n"), gpg_strerror (err));
+      log_error ("failed to disable buffering "
+                 "on socket stream: %s\n", gpg_strerror (err));
       goto out;
     }
 
diff --git a/configure.ac b/configure.ac
index 616baedd2..cfcd6ecba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.9.3"
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 m4_define([my_version], [1.9.90])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 
 m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \
diff --git a/po/be.po b/po/be.po
index 19f9a204c..bfc66409c 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -15,284 +15,711 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
+
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
 msgstr ""
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
+#: agent/call-pinentry.c:359
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
 msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "пароль занадта доўгі\n"
+
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "пароль занадта доўгі\n"
+
+#: agent/call-pinentry.c:426
+msgid "Invalid characters in PIN"
 msgstr ""
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "немагчыма адкрыць \"%s\"\n"
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
 
-#: cipher/random.c:408
-#, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "запіс у stdout\n"
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "дрэнны MPI"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "дрэнны пароль"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "дрэнны пароль"
+
+#: agent/command-ssh.c:533
 #, c-format
-msgid "can't open `%s': %s\n"
+msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: cipher/random.c:458
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
 #, c-format
-msgid "can't stat `%s': %s\n"
+msgid "can't create `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
+msgid "can't open `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr ""
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
+#: agent/command-ssh.c:1623
+#, c-format
+msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: cipher/random.c:482
+#: agent/command-ssh.c:1628
 #, c-format
-msgid "can't read `%s': %s\n"
+msgid "error getting default authentication keyID of card: %s\n"
 msgstr ""
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr ""
+"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
+"\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't create `%s': %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: cipher/random.c:556 cipher/random.c:566
-#, c-format
-msgid "can't write `%s': %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
+
+#: agent/divert-scd.c:217
+msgid "Admin PIN"
 msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Паўтарыце пароль: "
+
+#: agent/divert-scd.c:278
+msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
+#: agent/divert-scd.c:290
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: cipher/random.c:815
-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"
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
+
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "Увядзіце пароль\n"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 msgstr ""
 
-#: cipher/rndegd.c:202
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "Паўтарыце пароль\n"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
+"@\n"
+"Выбары:\n"
+" "
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
+
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "шматслоўнасьць"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "працаваць менш шматслоўна"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+msgid "|FILE|read options from FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+msgid "use a log file for the server"
+msgstr ""
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+msgid "do not use the SCdaemon"
+msgstr ""
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "Паўтарыце пароль\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
 
-#: g10/app-openpgp.c:596
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "грамадскі ключ ня знойдзены"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
 #, c-format
-msgid "PIN callback returned error: %s\n"
+msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "error creating `%s': %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, fuzzy, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
 #, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
+msgid "can't create socket: %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "запіс у stdout\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: тэчка створана\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1451
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, c-format
+msgid "%s %s stopped\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1650
+msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "памылка стварэньня \"%s\": %s\n"
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
-msgid "error reading application data\n"
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "паказаць ключы й адбіткі пальцаў"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/app-openpgp.c:1562
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
-#, fuzzy
-msgid "generating new key\n"
-msgstr "стварыць новую пару ключоў"
+#: agent/protect-tool.c:1206
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr ""
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr ""
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr ""
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "дрэнны пароль"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "скасавана карыстальнікам\n"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "сакрэтны ключ недаступны"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "памылка чытаньня файла"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: agent/trustlist.c:228
 #, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
+msgid "error reading `%s', line %d: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
+
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "стварыць новую пару ключоў"
+msgid "Yes"
+msgstr "yes [так]"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:279 common/exechelp.c:370
+#, fuzzy, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "key generation completed (%d seconds)\n"
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:446
+#, fuzzy, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: common/exechelp.c:487
+#, c-format
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:498
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
+msgid "error running `%s': terminated\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/app-openpgp.c:2134
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "can't connect to `%s': %s\n"
+msgstr ""
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/simple-pwquery.c:389
+msgid "problem setting the gpg-agent options\n"
+msgstr ""
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "скасавана карыстальнікам\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+msgid "problem with the agent\n"
+msgstr ""
+
+#: common/sysutils.c:88 g10/misc.c:137
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#: common/sysutils.c:183
+#, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/sysutils.c:215
 #, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr ""
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+#, fuzzy
+msgid "yes"
+msgstr "yes [так]"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "no [не]"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "quit [выйсьці]"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr ""
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr ""
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+msgid "cC"
 msgstr ""
 
 #: g10/armor.c:320
@@ -369,170 +796,204 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr ""
+
+#: g10/build-packet.c:962
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr ""
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr ""
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr ""
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr ""
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "непадтрымліваецца"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -540,203 +1001,152 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "сакрэтны ключ недаступны"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "збой падпісаньня: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr ""
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr ""
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Паўтарыце пароль: "
-
-#: g10/cardglue.c:952
-msgid "PIN not correctly repeated; try again"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr ""
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -777,213 +1187,246 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr ""
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, fuzzy, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "%s: немагчыма стварыць тэчку: %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr ""
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:61
+#: g10/export.c:63
 msgid "export signatures that are marked as local-only"
 msgstr ""
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/export.c:69
+#: g10/export.c:71
 msgid "remove unusable parts from key during export"
 msgstr ""
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr ""
+
+#: g10/getkey.c:176
+msgid "[User ID not found]"
+msgstr ""
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr ""
+
+#: g10/getkey.c:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: g10/getkey.c:2659
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr ""
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -991,128 +1434,129 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1122,51 +1566,47 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "шматслоўнасьць"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1174,7 +1614,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1194,15 +1634,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1212,7 +1652,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1220,639 +1660,581 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr ""
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr ""
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr ""
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2826
-#, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr ""
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:2986
+#: g10/gpg.c:3010
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:3012
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr ""
-
-#: g10/getkey.c:175
-msgid "[User ID not found]"
-msgstr ""
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr ""
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr ""
-
-#: g10/getkey.c:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "%s: немагчыма стварыць тэчку: %s\n"
-
-#: g10/getkey.c:2658
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr ""
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "працаваць менш шматслоўна"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr ""
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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:55
+#: g10/helptext.c:57
 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"
@@ -1860,16 +2242,16 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:66
+#: g10/helptext.c:68
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1883,23 +2265,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr ""
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr ""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1907,19 +2289,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1928,11 +2310,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:148
+#: g10/helptext.c:150
 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"
@@ -1973,28 +2355,28 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2002,13 +2384,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2017,36 +2399,36 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Адкажыце \"так\", калі Вы згодны з перазапісам файла"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2062,18 +2444,18 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 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:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Даведка адсутнічае"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Для \"%s\" даведка адсутнічае"
@@ -2106,487 +2488,483 @@ msgstr ""
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr ""
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr ""
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
-msgstr ""
-
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-msgid "         algorithms on these user IDs:\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr ""
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr ""
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr ""
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2594,244 +2972,244 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr ""
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr ""
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr ""
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr ""
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr ""
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 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:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2839,204 +3217,204 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 msgid "Do you really want to do this? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "дрэнны ключ"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 msgid "toggle between the secret and public key listings"
 msgstr ""
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "падпісаць ключ"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Даступны сакрэтны ключ.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3044,160 +3422,160 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3205,508 +3583,513 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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:3011
+#: g10/keyedit.c:3012
 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 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:3352
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr ""
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "зашыфраваць даньні"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr ""
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr ""
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3716,7 +4099,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3726,48 +4109,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3777,44 +4160,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3822,7 +4205,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3837,34 +4220,34 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1997
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -3872,7 +4255,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -3880,96 +4263,96 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr ""
 
@@ -3997,623 +4380,596 @@ msgstr ""
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr ""
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: створаны зьвязак ключоў\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr ""
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, c-format
 msgid "searching for names from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 #, fuzzy
 msgid "Key available at: "
 msgstr "Даведка адсутнічае"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr ""
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr ""
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1017
+#: g10/misc.c:1106
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Файл \"%s\" ужо йснуе. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Увядзіце новае ймя файла"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "запіс у stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr ""
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: тэчка створана\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr ""
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr ""
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr ""
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr ""
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
@@ -4678,7 +5034,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Паўтарыце пароль: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4687,38 +5043,34 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 msgid "Are you sure you want to use it? (y/N) "
 msgstr ""
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr ""
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr ""
 
@@ -4978,61 +5330,56 @@ msgstr ""
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "памылка стварэньня \"%s\": %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Калі ласка, задайце назву файла даньняў: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "чытаецца stdin ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr ""
 
@@ -5147,144 +5494,144 @@ msgstr ""
 msgid "Is this okay? (y/N) "
 msgstr ""
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr ""
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Недапушчальны пароль. Калі ласка, паспрабуйце шчэ раз"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr ""
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:132
+#: g10/sign.c:133
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5301,48 +5648,48 @@ msgstr ""
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr ""
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
@@ -5396,51 +5743,51 @@ msgstr "памылка чытаньня файла"
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
@@ -5449,78 +5796,78 @@ msgstr ""
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
@@ -5529,7 +5876,7 @@ msgstr ""
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
@@ -5696,323 +6043,1413 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 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:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "агульная памылка"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr ""
 
-#: util/errors.c:56
-msgid "unknown packet type"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "невядомая вэрсыя"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
 msgstr ""
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
+
+#: kbx/kbxutil.c:108
+msgid ".\n"
 msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "дрэнны грамадскі ключ"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "дрэнны сакрэтны ключ"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:62
-msgid "bad signature"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "памылка праверчае сумы"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr ""
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "дрэнны пароль"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: util/errors.c:65
-msgid "public key not found"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "немагчыма адчыніць зьвязак ключоў"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:68
-msgid "invalid packet"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: util/errors.c:69
-msgid "invalid armor"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "карыстальнік з такім ID адсутнічае"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+msgid "error reading application data\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "паказаць ключы й адбіткі пальцаў"
+
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
+
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "стварыць новую пару ключоў"
+
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
+
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "стварыць новую пару ключоў"
+
+#: scd/app-openpgp.c:1942
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr ""
+
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
+
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+msgid "read options from file"
+msgstr ""
+
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
+
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
+
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
+
+#: scd/scdaemon.c:126
+msgid "do not use the internal CCID driver"
+msgstr ""
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
+
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "несумяшчальныя загады\n"
+
+#: scd/scdaemon.c:191
+#, fuzzy
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
+
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
+
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
+
+#: scd/scdaemon.c:1008
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr ""
+
+#: scd/scdaemon.c:1013
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr ""
+
+#: sm/base64.c:318
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr ""
+
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
+
+#: sm/call-dirmngr.c:216
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr ""
+
+#: sm/call-dirmngr.c:228
+#, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr ""
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr ""
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
 msgstr "сакрэтны ключ недаступны"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "непадтрымліваецца"
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "дрэнны ключ"
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "памылка чытаньня файла"
+#: sm/certchain.c:607
+msgid "certificate has been revoked"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "памылка запісу файла"
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "дрэнны сэртыфікат"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "невядомы альгарытм сьцісканьня"
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Даведка адсутнічае"
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "памылка адчыненьня файла"
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "збой падпісаньня: %s\n"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "памылка стварэньня файла"
+#: sm/certchain.c:700
+msgid "no issuer found in certificate"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "нерэчаісны пароль"
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
 msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Гэты ключ згубіў састарэў!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: util/errors.c:83
-msgid "unknown signature class"
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: util/errors.c:84
-msgid "trust database error"
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "паказаць ключы й адбіткі пальцаў"
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "дрэнны MPI"
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "праверыць подпіс"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA патрабуе выкарыстаньня 160-і бітавага хэш-альгарытму\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
+msgstr "no [не]"
+
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "невядомая вэрсыя"
+
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "паказаць ключы й адбіткі пальцаў"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: util/errors.c:86
-msgid "resource limit"
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
 msgstr ""
+"Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для карыстальніка:\n"
+"\"%.*s\"\n"
+"%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: util/errors.c:88
-msgid "bad certificate"
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, c-format
+msgid "line %d: not a valid email address\n"
+msgstr ""
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: sm/delete.c:134
+#, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr ""
+
+#: sm/delete.c:136
+#, c-format
+msgid "certificate `%s' deleted\n"
+msgstr ""
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: sm/encrypt.c:333
+msgid "no valid recipients given\n"
+msgstr ""
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[файл]|зрабіць подпіс"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "паказаць сакрэтныя ключы"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
 msgstr "дрэнны сэртыфікат"
 
-#: util/errors.c:89
-msgid "malformed user id"
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "дрэнны сэртыфікат"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "дрэнны сэртыфікат"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
 msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "памылка зачыненьня файла"
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "памылка перайменаваньня файла"
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "памылка выдаленьня файла"
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "нечаканыя даньні"
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "дрэнны пароль"
 
-#: util/errors.c:94
-msgid "timestamp conflict"
+#: sm/gpgsm.c:282
+msgid "create base-64 encoded output"
 msgstr ""
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
 msgstr ""
 
-#: util/errors.c:96
-msgid "file exists"
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
 msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
 msgstr ""
 
-#: util/errors.c:98
-msgid "invalid argument"
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
 msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
 msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
 msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
 msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
 msgstr ""
 
-#: util/errors.c:106
-msgid "unusable public key"
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
+#: sm/gpgsm.c:318
+#, fuzzy
+msgid "|NAME|use NAME as default recipient"
+msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
 msgstr ""
 
-#: util/errors.c:108
-msgid "keyserver error"
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
 msgstr ""
 
-#: util/errors.c:109
+#: sm/gpgsm.c:341
 #, fuzzy
-msgid "canceled"
-msgstr "скасавана карыстальнікам\n"
+msgid "force v3 signatures"
+msgstr "праверыць подпісы ключа"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "заўсёдвы выкарыстоўваць MDC для шыфраваньня"
 
-#: util/errors.c:110
-msgid "no card"
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
 msgstr ""
 
-#: util/errors.c:111
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:351
 #, fuzzy
-msgid "no data"
-msgstr "зашыфраваць даньні"
+msgid "add this keyring to the list of keyrings"
+msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|ВУЗЕЛ|     выкарыстоўваць гэты паслужнік для пошуку ключоў"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|НАЗВА|     усталяваць мноства знакаў тэрмінала"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: util/logger.c:224
+#: sm/gpgsm.c:380
+#, fuzzy
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
+
+#: sm/gpgsm.c:382
+#, fuzzy
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: sm/gpgsm.c:384
+#, fuzzy
+msgid "|N|use compress algorithm N"
+msgstr "невядомы альгарытм сьцісканьня"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Сынтаксіс: gpg [выбары] [файлы]\n"
+"sign, check, encrypt ці decrypt\n"
+"Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "Выкарыстаньне: gpg [выбары] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: sm/gpgsm.c:772
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
+msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: util/logger.c:230
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
+msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, c-format
+msgid "total number processed: %lu\n"
+msgstr ""
+
+#: sm/import.c:227
+msgid "error storing certificate\n"
+msgstr ""
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "паказаць ключы й адбіткі пальцаў"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "%s: тэчка створана\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
 #, fuzzy
-msgid "yes"
-msgstr "yes [так]"
+msgid "failed to get the fingerprint\n"
+msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "yY"
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
-msgstr "no [не]"
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: sm/keydb.c:1392
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "паказаць ключы й адбіткі пальцаў"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr ""
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: sm/verify.c:507
+msgid "                aka"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "quit [выйсьці]"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "qQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
-msgid "cC"
+#: tools/gpg-connect-agent.c:126
+#, fuzzy
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
 msgstr ""
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "УВАГА! Выкарыстоўваецца небясьпечная памяць!\n"
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "пароль занадта доўгі\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "невядомая вэрсыя"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
 msgstr ""
-"па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "дзеяньне немагчымае без распачатае бясьпечнае памяці\n"
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "Выкарыстаньне: gpg [выбары] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Загады:\n"
+" "
+
+#: tools/symcryptrun.c:172
+msgid "decryption modus"
+msgstr ""
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "зашыфраваць даньні"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [назва_файла]"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
 msgstr ""
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA патрабуе выкарыстаньня 160-і бітавага хэш-альгарытму\n"
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s не дазваляецца разам з %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: tools/symcryptrun.c:542
+msgid "no --program option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "непадтрымліваецца"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "немагчыма адкрыць \"%s\"\n"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "сакрэтны ключ недаступны"
+
+#~ msgid "general error"
+#~ msgstr "агульная памылка"
+
+#~ msgid "unknown version"
+#~ msgstr "невядомая вэрсыя"
+
+#~ msgid "bad public key"
+#~ msgstr "дрэнны грамадскі ключ"
+
+#~ msgid "bad secret key"
+#~ msgstr "дрэнны сакрэтны ключ"
+
+#~ msgid "checksum error"
+#~ msgstr "памылка праверчае сумы"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "немагчыма адчыніць зьвязак ключоў"
+
+#~ msgid "no such user id"
+#~ msgstr "карыстальнік з такім ID адсутнічае"
+
+#~ msgid "bad key"
+#~ msgstr "дрэнны ключ"
+
+#~ msgid "file read error"
+#~ msgstr "памылка чытаньня файла"
+
+#~ msgid "file write error"
+#~ msgstr "памылка запісу файла"
+
+#~ msgid "file open error"
+#~ msgstr "памылка адчыненьня файла"
+
+#~ msgid "file create error"
+#~ msgstr "памылка стварэньня файла"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "нерэчаісны пароль"
+
+#~ msgid "file close error"
+#~ msgstr "памылка зачыненьня файла"
+
+#~ msgid "file rename error"
+#~ msgstr "памылка перайменаваньня файла"
+
+#~ msgid "file delete error"
+#~ msgstr "памылка выдаленьня файла"
+
+#~ msgid "unexpected data"
+#~ msgstr "нечаканыя даньні"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "зашыфраваць даньні"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "УВАГА! Выкарыстоўваецца небясьпечная памяць!\n"
+
+#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#~ msgstr ""
+#~ "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "дзеяньне немагчымае без распачатае бясьпечнае памяці\n"
 
 #, fuzzy
 #~ msgid "expired: %s)"
@@ -6034,13 +7471,6 @@ msgstr ""
 #~ msgid "User ID \"%s\": %d signatures removed.\n"
 #~ msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "памылка стварэньня \"%s\": %s\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "пароль занадта доўгі\n"
-
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key user-id"
 
@@ -6059,41 +7489,18 @@ msgstr ""
 #~ msgstr "агульная памылка"
 
 #, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "%s: немагчыма стварыць тэчку: %s\n"
-
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: немагчыма стварыць тэчку: %s\n"
-
-#, fuzzy
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "немагчыма адкрыць %s: %s\n"
 
-#, fuzzy
-#~ msgid "can't open file: %s\n"
-#~ msgstr "немагчыма адкрыць %s: %s\n"
-
 #~ 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 " (дапомна)"
 
diff --git a/po/ca.po b/po/ca.po
index 004e589ed..9a1b44380 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -26,8 +26,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -35,299 +35,732 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "no s'ha pogut generar un prim amb pbits=%u qbits=%u\n"
-
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "no s'ha pogut obrir «%s»\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: cipher/random.c:408
-#, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "s'està escrivint la clau secreta a «%s»\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "la línia és massa llarga\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
-#, c-format
-msgid "can't open `%s': %s\n"
-msgstr "no s'ha pogut obrir «%s»: %s\n"
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "la contrasenya és massa llarga\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "no es pot fer stat de «%s»: %s\n"
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-# Descartar, deixar passar...  ignorar és un anglicisme.  ivb
-#: cipher/random.c:463
-#, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "«%s» no és un fitxer regular: es descarta\n"
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "nota: el fitxer random_seed és buit\n"
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "l'MPI és erroni"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "la contrasenya és errònia"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "no s'ha pogut llegir «%s»: %s\n"
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "la contrasenya és errònia"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
+#: agent/command-ssh.c:533
+#, fuzzy, c-format
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "no s'ha pogut escriure «%s»: %s\n"
+msgid "can't open `%s': %s\n"
+msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-# No em passe! ;)  ivb
-#: cipher/random.c:569
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "can't close `%s': %s\n"
-msgstr "no s'ha pogut tancar «%s»: %s\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "AVÍS: esteu usant un generador de nombres aleatoris insegur!!\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: cipher/random.c:815
-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"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\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"
-"\n"
-"NO UTILITZEU CAP DADA GENERADA PER AQUEST PROGRAMA!!\n"
+"no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: cipher/rndegd.c:202
-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"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: cipher/rndlinux.c:132
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
+
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
+
+#: agent/command-ssh.c:2353
 #, 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"
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
 msgstr ""
-"\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"
 
-#: g10/app-openpgp.c:596
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
+
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "Introduïu el nom d'usuari: "
+
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Repetiu la contrasenya: "
+
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
+
+#: agent/divert-scd.c:290
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr ""
 
-#: g10/app-openpgp.c:609
+#: agent/genkey.c:109
 #, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Cal una contrasenya per a protegir la clau secreta.\n"
+"\n"
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "canvia la contrasenya"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "canvia la contrasenya"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opcions:\n"
+" "
+
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "detall"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "una mica més silenciós"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|FITXER|carrega el mòdul d'extensió especificat"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "cerca claus en un servidor de claus"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr ""
+"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "actualitza la base de dades de confiança"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
+msgstr ""
+
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "l'enviament al servidor de claus ha fallat: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "fitxer d'opcions «%s»: %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "s'estan llegint opcions de «%s»\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "error en crear «%s»: %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "no es pot crear el directori «%s»: %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "no s'ha pogut crear «%s»: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "error mentre s'enviava a «%s»: %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "ha fallat l'actualització: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "s'està escrivint la clau secreta a «%s»\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: s'ha creat el directori\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: no s'ha pogut crear el directori: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "error en crear «%s»: %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "\t%lu claus es descarta\n"
+
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent no està disponible en aquesta sessió\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
+
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "error: l'empremta digital és invàlida\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/app-openpgp.c:1562
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "«%s» ja està comprimida\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "genera un nou parell de claus"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "la contrasenya és errònia"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "Cancel·la"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "fitxer d'opcions «%s»: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+# Parts?  Peces?  ivb
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "parts de la clau secreta no estan disponbles\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "error de lectura: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "La generació de claus ha fallat: %s\n"
+msgid "Yes"
+msgstr "sí|si"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "La generació de claus ha fallat: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "no es pot obrir el fitxer: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "signatura %s, algorisme de resum %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "error en crear «%s»: %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "%s: no s'ha trobat l'usuari\n"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent no està disponible en aquesta sessió\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "no s'ha pogut connectar amb «%s»: %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "s'ha cancel·lat per l'usuari\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
+
+# bolcats de memòria?  ivb
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
+
+# Indi. ivb
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "sí|si"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "sS"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "ix"
+
+# «xX»?  ivb
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "xX"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
+#: common/yesno.c:114
+msgid "oO"
 msgstr ""
 
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: g10/armor.c:320
 #, c-format
 msgid "armor: %s\n"
@@ -408,43 +841,80 @@ msgstr ""
 "hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha "
 "utilitzat un MTA amb errors\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
+"amb el signe «=»\n"
+
+#: g10/build-packet.c:956
+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/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
+
+#: g10/build-packet.c:980
+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"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "no llegible per humans"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no està disponible"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr "home"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr "dóna"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "no especificat"
 
@@ -452,134 +922,134 @@ msgstr "no especificat"
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -587,209 +1057,154 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "la clau secreta no està disponible"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-#, fuzzy
-msgid "Enter New Admin PIN: "
-msgstr "Introduïu el nom d'usuari: "
-
-#: g10/cardglue.c:918
-#, fuzzy
-msgid "Enter New PIN: "
-msgstr "Introduïu el nom d'usuari: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-#, fuzzy
-msgid "Enter PIN: "
-msgstr "Introduïu el nom d'usuari: "
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Repetiu la contrasenya: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output no funciona per a aquesta ordre\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -834,55 +1249,55 @@ msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "s'està llegint des de «%s»\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: 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:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -891,178 +1306,215 @@ msgstr ""
 "forçar l'algoritme de compressió %s (%d) viola les preferències del "
 "destinatari\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, 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:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, 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/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
 # És no-wrap?  ivb
 # Com? jm
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 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"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "problema en tractar amb un paquet xifrat\n"
 
 # Execució de programes remots, o execució remota de programes? jm
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "no hi ha suport per a l'execució remota de programes\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "no es pot crear el directori «%s»: %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "aquesta plataforma necessita fitxers temporals quan es crida a programes "
 "externs\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "s'ha produït una eixida no natural del programa extern\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "no s'ha pogut executar el programa extern\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, 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:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, 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/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "la clau secreta és inusable"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clau %08lX: no està protegida - es descarta\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, 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:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, fuzzy, c-format
 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:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "AVÍS: no s'ha exportat res\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr ""
+"hi ha massa entrades en la memòria cau de claus públiques - desactivada\n"
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[No s'ha trobat l'id d'usuari]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, 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:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %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:2659
+#, 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/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1070,130 +1522,131 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1203,52 +1656,47 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "detall"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1259,7 +1707,7 @@ msgstr ""
 # 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/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1279,15 +1727,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1302,7 +1750,7 @@ msgstr ""
 # 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/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1310,650 +1758,588 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, 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/gpg.c:1258
+#: g10/gpg.c:1274
 #, 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/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, 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/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, 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/gpg.c:1282
+#: g10/gpg.c:1298
 #, 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/gpg.c:1285
+#: g10/gpg.c:1301
 #, 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/gpg.c:1291
+#: g10/gpg.c:1307
 #, 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/gpg.c:1294
+#: g10/gpg.c:1310
 #, 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/gpg.c:1297
+#: g10/gpg.c:1313
 #, 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/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "fitxer d'opcions «%s»: %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "s'estan llegint opcions de «%s»\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, 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/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent no està disponible en aquesta sessió\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # clares -> en clar?  ivb
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 #, 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/gpg.c:2988
+#: g10/gpg.c:3012
 #, 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, fuzzy, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, fuzzy, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, 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"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 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/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, 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/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, 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/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr ""
-"hi ha massa entrades en la memòria cau de claus públiques - desactivada\n"
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[No s'ha trobat l'id d'usuari]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, 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:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %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:2658
-#, 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/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "una mica més silenciós"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "pren les claus d'aquest anell"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps només un avís"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 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:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1961,7 +2347,7 @@ msgstr ""
 "Sintaxi: gpg [opcions] [fitxers]\n"
 "Comprova signatures amb claus conegudes amb confiança\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1971,7 +2357,7 @@ msgstr ""
 "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:55
+#: g10/helptext.c:57
 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"
@@ -1985,17 +2371,17 @@ msgstr ""
 
 # "clau no confiable"? jm
 # No fiable, no de confiança, no de fiar...  ivb
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Si voleu utilitzar aquesta clau no de confiança de totes maneres, dieu «sí»."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:68
 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."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2009,7 +2395,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -2019,16 +2405,16 @@ msgstr ""
 "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:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Introduïu la grandària de la clau"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Contesteu «sí» o «no»"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -2040,19 +2426,19 @@ msgstr ""
 "una bona resposta d'error - en canvi, el sistema tractarà d'interpretar\n"
 "el valor donat com un interval."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Introduïu el nom del propietari de la clau"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "introduïu una adreça de correu (opcional però molt recomanable)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Introduïu un comentari opcional"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2066,11 +2452,11 @@ msgstr ""
 "O  continua la generació de les claus.\n"
 "Q  ix."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:150
 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"
@@ -2149,12 +2535,12 @@ msgstr ""
 "\n"
 "Si no sabeu quina és la resposta correcta, contesteu «0»."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Contesteu «sí» si voleu signar TOTS els ID d'usuari"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2162,11 +2548,11 @@ msgstr ""
 "Contesteu «sí» si realment voleu eliminar aquest ID d'usuari.\n"
 "Tots els certificats també es perdran!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Contesteu «sí» si és correcte eliminar la subclau"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2177,7 +2563,7 @@ msgstr ""
 "una connexió de confiança a la clau o a un altra clau certificada\n"
 "per aquesta clau."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2190,7 +2576,7 @@ msgstr ""
 "podria establir una connexió de confiança a través d'una altra clau ja\n"
 "certificada."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2198,7 +2584,7 @@ msgstr ""
 "La signatura no és vàlida. Té sentit que l'elimineu de l'anell\n"
 "de claus."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2212,7 +2598,7 @@ msgstr ""
 "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:223
+#: g10/helptext.c:225
 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"
@@ -2223,23 +2609,23 @@ msgstr ""
 "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:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Per favor, repetiu l'última contrasenya per confirmar-la."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "Doneu el nom del fitxer al qual s'aplica la signatura"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Contesteu «sí» si és correcte sobreescriure el fitxer"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2247,7 +2633,7 @@ msgstr ""
 "Introduïu un nom de fitxer. Si premeu RETORN s'hi usarà el fitxer\n"
 "predeterminat (apareix entre claudàtors)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2276,7 +2662,7 @@ msgstr ""
 "      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:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2286,11 +2672,11 @@ msgstr ""
 "certificat de revocació. Per favor, sigueu concisos.\n"
 "Una línia buida indica el final del text.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "No hi ha ajuda disponible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
@@ -2326,287 +2712,282 @@ msgstr "la clau secreta és inusable"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importades: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          no modificades: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subclaus noves: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importades: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Heu signat els següents ID d'usuari:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, 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:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no és vàlid\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 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:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, 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:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, 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:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, fuzzy, c-format
 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, 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:1203
+#: g10/import.c:1202
 #, 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:1233
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2616,22 +2997,22 @@ msgstr ""
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, 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:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, 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:1389
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -2639,195 +3020,195 @@ msgstr ""
 "s»\n"
 "\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, fuzzy, c-format
 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:1409
+#: g10/import.c:1408
 #, 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:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, 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:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 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:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, 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:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 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:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, 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:1788
+#: g10/import.c:1787
 #, 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:1802
+#: g10/import.c:1801
 #, 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:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[revocació]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 signatura errònia\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signatures errònies\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatura no comprovada per falta de clau\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures no comprovades a causa d'errors\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Han estat detectats %d IDs sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2839,65 +3220,65 @@ msgstr ""
 "verificar les claus d'altres usuaris (mirant passaports,\n"
 "comprovant empremtes de diferents fonts...)?\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Hi confie marginalment\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Hi confie plenament\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'ID d'usuari «%s» ha caducat."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2906,11 +3287,11 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 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:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2919,11 +3300,11 @@ msgstr ""
 "La vostra signatura actual en «%s»\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2932,54 +3313,54 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura local.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "«%s» ja estava signada amb la clau %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 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:810
+#: g10/keyedit.c:811
 #, 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:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aquesta clau caducarà el %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:890
 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:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Açò inutilitzaria la clau en PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2989,32 +3370,32 @@ msgstr ""
 "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
 "contestar, entreu «0».\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No ho he comprovat en absolut.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3023,100 +3404,100 @@ msgstr ""
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3124,11 +3505,11 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3137,65 +3518,65 @@ msgstr ""
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Esteu segur de voler fer açò? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "s'està posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
 # 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:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
 # 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:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -3203,153 +3584,153 @@ msgstr "afegeix un ID d'usuari"
 # 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:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "canvia entre el llistat de claus secretes i públiques"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "La clau secreta està disponible.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer açò.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre «toggle» abans.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3357,246 +3738,246 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "la classe de signatura és desconeguda"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de preferències"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3604,19 +3985,19 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3626,7 +4007,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3635,58 +4016,58 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
 # 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3695,379 +4076,384 @@ 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:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 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"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 #, fuzzy
 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, 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:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 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/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferència %c%lu és duplicada\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, 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:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "s'està escrivint una signatura directa\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "s'està escrivint l'autosignatura\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (només xifrar)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4083,7 +4469,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4099,42 +4485,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
 # Amb «it» es refereix a les dates?  ivb
 # Això vaig entendre jo. jm
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4142,12 +4528,12 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les tractarà bé fins l'any 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4164,44 +4550,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4212,7 +4598,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
 
@@ -4229,23 +4615,23 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1997
 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 / (X) ix"
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4253,12 +4639,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4270,7 +4656,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4282,53 +4668,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "s'han creat i signat les claus pública i secreta.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4337,13 +4723,13 @@ 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"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4352,7 +4738,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4360,31 +4746,31 @@ 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:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "mai       "
 
@@ -4412,535 +4798,529 @@ msgstr "Notació de signatura: "
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau primària:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "     Empremta digital de la subclau:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau primària:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVÍS: hi ha 2 fitxers amb informació confidencial.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s és el que no ha canviat\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s és el nou\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favor, solucioneu aquest possible problema de seguretat\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "s'està comprovant l'anell «%s»\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
 # Fitxer indi fins final.  Hau!  ivb
 # Grrr. Com em tracten els esclaus ja... jm
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s'ha creat l'anell\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 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:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "s'assumeixen dades xifrades amb %s\n"
 
 # L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé!  ivb
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
-# bolcats de memòria?  ivb
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "l'algoritme de xifratge no és implementat"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el mòdul de xifratge IDEA no està present\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostra més informació\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
@@ -4948,111 +5328,89 @@ msgstr "AVÍS: %s és una opció desaconsellada.\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:707
+#: g10/misc.c:796
 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:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fitxer «%s» existeix. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: el sufix és desconegut\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Introduïu el nou nom del fitxer"
 
 # Indi?  ivb
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "s'està escrivint en stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "s'asumeix que hi ha dades signades en «%s»\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: s'ha creat el directori\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 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:1157
+#: g10/parse-packet.c:1211
 #, 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"
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent no està disponible en aquesta sessió\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "no s'ha pogut connectar amb «%s»: %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "hi ha un problema amb l'agent: es deshabilitarà el seu ús\n"
@@ -5129,7 +5487,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Repetiu la contrasenya: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5144,39 +5502,35 @@ msgstr ""
 "molt gran!\n"
 "Es recomana una imatge amb una mida aproximada de 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduïu el nom del fitxer JPEG per al photo ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "No s'ha pogut obrir la foto «%s»: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "«%s» no és un fitxer JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "És aquesta foto correcta (s/N/x)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
 
@@ -5461,65 +5815,60 @@ msgstr "no hi ha adreces vàlides\n"
 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"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "error en crear «%s»: %s\n"
-
 # Indi? ivb
 # Em pense que no. jm
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Signatura separada.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Introduïu el nom del fitxer de dades: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "s'està llegint d'stdin...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
 # Indi? ivb
 # Yeh... jm
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 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:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'acord, som el destinatari anònim.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la codificació antiga del DEK no està suportada\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritme de xifratge %d%s és desconegut o està desactivat\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, fuzzy, c-format
 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/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
@@ -5644,92 +5993,92 @@ msgid "Is this okay? (y/N) "
 msgstr "És açò correcte? "
 
 # Parts?  Peces?  ivb
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, 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:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "La contrasenya no és vàlida; torneu a intentar-ho"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "AVÍS: la clau és feble; per favor, canvieu la contrasenya.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 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/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "s'hi ha creat una clau feble - reintent\n"
 
 # És no-wrap?  ivb
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, 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"
 "hi ha hagut %d intents!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVÍS: conflicte de signatures digest en el missatge\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 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:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 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"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5738,7 +6087,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5746,61 +6095,61 @@ 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:205
+#: g10/sig-check.c:215
 #, 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:287
+#: g10/sig-check.c:298
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític "
 "desconegut\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, 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:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5808,7 +6157,7 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5827,54 +6176,54 @@ msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 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 "
 "fals!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "es descarta «%s»: duplicat\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "es descarta «%s»: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5934,54 +6283,54 @@ msgstr "error de lectura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, 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"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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): %"
 "s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "la transacció de la base de dades de confiança és massa gran\n"
 
 # No em passe! ;)  ivb
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: el directori no existeix!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: no s'ha pogut crear un registre de versió: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: s'ha creat una base de dades de confiança invàlida\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
@@ -5990,78 +6339,78 @@ msgstr "%s: s'ha creat la base de dades de confiança\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: la base de dades de confiança és invàlida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error en actualitzar el registre de la versió: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error en llegir el registre de la versió: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error en escriure el registre de la versió: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dades de confiança: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, 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"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s no és un fitxer de base de dades de confiança\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registre de versió amb número de registre %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: la versió de fitxer %d és invàlida\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, 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:1459
+#: g10/tdbio.c:1452
 #, 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:1504
+#: g10/tdbio.c:1497
 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 --"
@@ -6072,7 +6421,7 @@ msgstr ""
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "no es poden tractar línies més llargues de %d caràcters\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la línia d'entrada és superior a %d caràcters\n"
@@ -6249,7 +6598,7 @@ msgstr ""
 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:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6260,365 +6609,1655 @@ msgstr ""
 "ha de ser el primer que figure en la línia d'ordres.\n"
 
 # LF -> fi de línia?  ivb
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "error general"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "heu trobat un bug... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "el tipus de paquet és desconegut"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "la versió és desconeguda"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "no es pot obrir el fitxer: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "l'algoritme de clau pública és desconegut"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "l'algoritme de resum és desconegut"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "la clau pública és errònia"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "la clau secreta és errònia"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "la signatura és errònia"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "la suma de control és errònia"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "la contrasenya és errònia"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "no s'ha trobat la clau pública"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "l'algoritme de xifratge és desconegut"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "no s'ha pogut obrir l'anell"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "el paquet és invàlid"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "l'armadura és invàlida"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "no s'ha trobat l'id de l'usuari"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "la clau secreta no està disponible"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "s'ha utilitzat una clau secreta incorrecta"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-# Gènere?  Nombre?  ivb
-# Werner FIXME: please add translator comment saying *what* is
-# uncompressed so we know the gender. jm
-#: util/errors.c:73
-msgid "not supported"
-msgstr "no és suportat"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "la clau és incorrecta"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "error de lectura"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "error d'escriptura"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "l'algoritme de compressió és desconegut"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "error en l'obertura del fitxer"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "error en la creació del fitxer"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "la contrasenya és invàlida"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "l'algoritme de clau pública no és implementat"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "l'algoritme de xifratge no és implementat"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error en crear «%s»: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "la classe de signatura és desconeguda"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "error de la base de dades de confiança"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "error: l'empremta digital és invàlida\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "l'MPI és erroni"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "«%s» ja està comprimida\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "límit de recursos"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "l'anell no és vàlid"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "genera un nou parell de claus"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "el certificat és incorrecte"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "l'id d'usuari és malformat"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "error en el tancament del fitxer"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "error en el reanomenament del fitxer"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "error en l'eliminació del fitxer"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "dades inesperades"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "conflicte de data"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "La generació de claus ha fallat: %s\n"
 
-# Ací veus pq jo pose «no és vàlid» en comptes de «és invàlid».  ivb
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "l'algoritme de clau pública és inusable"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "La generació de claus ha fallat: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "el fitxer existeix"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-# Segons context: la clau és feble?  ivb
-#: util/errors.c:97
-msgid "weak key"
-msgstr "clau feble"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "signatura %s, algorisme de resum %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "l'argument és invàlid"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-# La «U» és masculina o femenina?  ivb
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "l'URI és errònia"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-# Ídem.  ivb
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "l'URI no és suportada"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "error de la xarxa"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr ""
 
-# Gènere?  Nombre?  ivb
-# Werner FIXME: please add translator comment saying *what* is
-# uncompressed so we know the gender. jm
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "no és xifrat"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-# 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:104
-msgid "not processed"
-msgstr "no processat"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "s'estan llegint opcions de «%s»\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "ls clau pública és inusable"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "la clau secreta és inusable"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-# «del servidor», «en el servidor»?  ivb
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "error de servidor de claus"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "Cancel·la"
+msgid "do not use the internal CCID driver"
+msgstr "no usa el terminal en absolut"
 
-# Gènere?  Nombre?  ivb
-# Werner FIXME: please add translator comment saying *what* is
-# uncompressed so we know the gender. jm
-#: util/errors.c:110
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
+
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "no és xifrat"
+msgid "allow the use of admin card commands"
+msgstr "les ordres entren en conflicte\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "no hi ha dades signades\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... açò és un bug (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "heu trobat un bug... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "sí|si"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "sS"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "no s'ha pogut obrir «%s»: %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "s'està escrivint la clau secreta a «%s»\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "NOTA: aquesta clau ha estat revocada!"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "Certificat correcte"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "La clau és disponible en: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Certificat correcte"
+
+#: sm/certchain.c:713
+#, fuzzy, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "problema en la lectura del certificat: %s\n"
+
+#: sm/certchain.c:729
+#, fuzzy
+msgid "certificate not yet valid"
+msgstr "Certificat de revocació vàlid"
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "problema en la lectura del certificat: %s\n"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"No s'han trobat certificats amb confiança no definida.\n"
+"\n"
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "Empremta digital:"
+
+#: sm/certchain.c:860
+#, fuzzy
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+"No s'han trobat certificats amb confiança no definida.\n"
+"\n"
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+#, fuzzy
+msgid "certificate chain too long\n"
+msgstr "Certificat de revocació vàlid"
+
+#: sm/certchain.c:913
+#, fuzzy
+msgid "issuer certificate not found"
+msgstr "Certificat de revocació vàlid"
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "verifica una signatura"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "[no establert]"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "error: l'empremta digital és invàlida\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "error: l'empremta digital és invàlida\n"
+
+# Com es canvia l'ordre dels arguments? jm
+# Ah, bingo! jm
+# 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
+# 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
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"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"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "l'algoritme de dispersió és invàlid «%s»\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "No és una adreça vàlida\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "error en crear l'anell «%s»: %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "La generació de claus ha fallat: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "certificat duplicat: esborrat"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "certificat duplicat: esborrat"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(No es va donar una descripció)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: error en escriure el registre de directoris: %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[fitxer]|crea una signatura"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[fitxer]|crea una signatura en text clar"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "llista claus secretes"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "Certificat de revocació vàlid"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "elimina claus de l'anell públic"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "Certificat correcte"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "Certificat correcte"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "canvia la contrasenya"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "crea eixida amb armadura ascii"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NOM|usa NOM com a destinatari predeterminat"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "usa la clau predeterminada com a destinatari predeterminat"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "no usa el terminal en absolut"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "força signatures v3"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "sempre utilitza un MDC per a xifrar"
+
+# Mode desatès (SC)  ivb
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "mode desatès: no pregunta mai"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "suposa «sí» en la majoria de les preguntes"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "suposa «no» en la majoria de les preguntes"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "afegeix aquest anell a la llista"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "afegeix aquest anell secret a la llista"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOM|usa NOM com a clau secreta predeterminada"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|usa aquest servidor per a cercar claus"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NOM|el joc de caràcters serà NOM"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|FITXER|carrega el mòdul d'extensió especificat"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOM|usa l'algoritme de xifratge NOM"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|usa l'algoritme de compressió N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sintaxi: gpg [opcions] [fitxers]\n"
+"signa, comprova, xifra o desxifra\n"
+"l'operació predeterminada depén de les dades introduïdes\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "forma d'ús: gpg [opcions] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "no s'ha pogut connectar amb «%s»: %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+# No em passe! ;)  ivb
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "no s'ha pogut tancar «%s»: %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Nombre total processat: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "Certificat correcte"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "error en crear l'anell «%s»: %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "s'ha creat l'anell «%s»\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "error en crear «%s»: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "error: l'empremta digital és invàlida\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Aquesta signatura va caducar el %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Signatura correcta de \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "              alias \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "ix"
 
-# «xX»?  ivb
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "xX"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "AVÍS: esteu usant memòria insegura!\n"
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
-"si us plau, visiteu http://www.gnupg.org/faq.html per a més informació\n"
 
-# Últimament pense si «iniciar» no serà millor que «inicialitzar»?  ivb
-# Segons SC, hi ha diferència. jm
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "l'operació no és possible sense memòria segura inicialitzada\n"
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "la línia és massa llarga\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "el destinatari predeterminat és desconegut «%s»\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "Ha fallat el procés de signatura: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "error mentre s'enviava a «%s»: %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "error mentre s'enviava a «%s»: %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "forma d'ús: gpg [opcions] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "no s'ha trobat la clau pública"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error en crear l'anell «%s»: %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Ordres:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "desxifratge correcte\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "desxifratge correcte\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [nom_del_fitxer]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s no és permés amb %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "no es pot crear el directori «%s»: %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "no s'ha pogut obrir %s: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+# Execució de programes remots, o execució remota de programes? jm
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "no hi ha suport per a l'execució remota de programes\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "no s'ha pogut crear «%s»: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "no s'ha pogut crear «%s»: %s\n"
+
+#: tools/symcryptrun.c:606
+#, fuzzy, c-format
+msgid "could not fork: %s\n"
+msgstr "%s: no s'ha trobat l'usuari: %s\n"
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "ha fallat l'actualització: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "ha fallat l'actualització: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "ha fallat l'actualització: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "ha fallat l'actualització: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "%s: no s'ha creat l'anell: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "no s'ha pogut crear «%s»: %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "l'algoritme de protecció %d%s no està suportat\n"
+
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "no s'ha pogut generar un prim amb pbits=%u qbits=%u\n"
+
+#~ 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"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "no s'ha pogut obrir «%s»\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "s'està escrivint la clau secreta a «%s»\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "no es pot fer stat de «%s»: %s\n"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
+# Descartar, deixar passar...  ignorar és un anglicisme.  ivb
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "«%s» no és un fitxer regular: es descarta\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "nota: el fitxer random_seed és buit\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "no s'ha pogut llegir «%s»: %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "no s'ha pogut escriure «%s»: %s\n"
+
+# No em passe! ;)  ivb
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "no s'ha pogut tancar «%s»: %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "AVÍS: esteu usant un generador de nombres aleatoris insegur!!\n"
 
 #~ 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"
+#~ "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 ""
+#~ "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"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "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 ""
-#~ "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
-#~ "amb el signe «=»\n"
+#~ "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"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
+#~ 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"
+#~ "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"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
+#~ msgid "card reader not available\n"
+#~ msgstr "la clau secreta no està disponible"
 
-#~ 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"
+#, fuzzy
+#~ msgid "Enter New PIN: "
+#~ msgstr "Introduïu el nom d'usuari: "
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
+#, fuzzy
+#~ msgid "Enter PIN: "
+#~ msgstr "Introduïu el nom d'usuari: "
 
-#~ msgid "not human readable"
-#~ msgstr "no llegible per humans"
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "gpg-agent no està disponible en aquesta sessió\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Heu signat els següents ID d'usuari:\n"
+
+#~ msgid "general error"
+#~ msgstr "error general"
+
+#~ msgid "unknown packet type"
+#~ msgstr "el tipus de paquet és desconegut"
+
+#~ msgid "unknown version"
+#~ msgstr "la versió és desconeguda"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "l'algoritme de clau pública és desconegut"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "l'algoritme de resum és desconegut"
+
+#~ msgid "bad public key"
+#~ msgstr "la clau pública és errònia"
+
+#~ msgid "bad secret key"
+#~ msgstr "la clau secreta és errònia"
+
+#~ msgid "bad signature"
+#~ msgstr "la signatura és errònia"
+
+#~ msgid "checksum error"
+#~ msgstr "la suma de control és errònia"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "l'algoritme de xifratge és desconegut"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "no s'ha pogut obrir l'anell"
+
+#~ msgid "invalid packet"
+#~ msgstr "el paquet és invàlid"
+
+#~ msgid "invalid armor"
+#~ msgstr "l'armadura és invàlida"
+
+#~ msgid "no such user id"
+#~ msgstr "no s'ha trobat l'id de l'usuari"
+
+#~ msgid "secret key not available"
+#~ msgstr "la clau secreta no està disponible"
+
+#~ 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
+#~ msgid "not supported"
+#~ msgstr "no és suportat"
+
+#~ msgid "bad key"
+#~ msgstr "la clau és incorrecta"
+
+#~ msgid "file read error"
+#~ msgstr "error de lectura"
+
+#~ msgid "file write error"
+#~ msgstr "error d'escriptura"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "l'algoritme de compressió és desconegut"
+
+#~ msgid "file open error"
+#~ msgstr "error en l'obertura del fitxer"
+
+#~ msgid "file create error"
+#~ msgstr "error en la creació del fitxer"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "la contrasenya és invàlida"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "l'algoritme de clau pública no és implementat"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "l'algoritme de xifratge no és implementat"
+
+#~ msgid "unknown signature class"
+#~ msgstr "la classe de signatura és desconeguda"
+
+#~ msgid "trust database error"
+#~ msgstr "error de la base de dades de confiança"
+
+#~ msgid "resource limit"
+#~ msgstr "límit de recursos"
+
+#~ msgid "invalid keyring"
+#~ msgstr "l'anell no és vàlid"
+
+#~ msgid "bad certificate"
+#~ msgstr "el certificat és incorrecte"
+
+#~ msgid "malformed user id"
+#~ msgstr "l'id d'usuari és malformat"
+
+#~ msgid "file close error"
+#~ msgstr "error en el tancament del fitxer"
+
+#~ msgid "file rename error"
+#~ msgstr "error en el reanomenament del fitxer"
+
+#~ msgid "file delete error"
+#~ msgstr "error en l'eliminació del fitxer"
+
+#~ msgid "unexpected data"
+#~ 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
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "l'algoritme de clau pública és inusable"
+
+#~ msgid "file exists"
+#~ msgstr "el fitxer existeix"
+
+# Segons context: la clau és feble?  ivb
+#~ msgid "weak key"
+#~ msgstr "clau feble"
+
+#~ msgid "invalid argument"
+#~ msgstr "l'argument és invàlid"
+
+# La «U» és masculina o femenina?  ivb
+#~ msgid "bad URI"
+#~ msgstr "l'URI és errònia"
+
+# Ídem.  ivb
+#~ msgid "unsupported URI"
+#~ msgstr "l'URI no és suportada"
+
+#~ 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
+#~ msgid "not encrypted"
+#~ 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
+#~ msgid "not processed"
+#~ msgstr "no processat"
+
+#~ msgid "unusable public key"
+#~ msgstr "ls clau pública és inusable"
+
+#~ msgid "unusable secret key"
+#~ msgstr "la clau secreta és inusable"
+
+# «del servidor», «en el servidor»?  ivb
+#~ msgid "keyserver error"
+#~ msgstr "error de servidor de claus"
+
+# Gènere?  Nombre?  ivb
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "no és xifrat"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "no hi ha dades signades\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... açò és un bug (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "AVÍS: esteu usant memòria insegura!\n"
+
+#~ 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"
+
+# Últimament pense si «iniciar» no serà millor que «inicialitzar»?  ivb
+# Segons SC, hi ha diferència. jm
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "l'operació no és possible sense memòria segura inicialitzada\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
+
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6657,10 +8296,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "No hi ha usuari per a la clau\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "error en la creació de la contrasenya: %s\n"
-
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr ""
 #~ "la contrasenya és incorrecta o l'algoritme de xifratge (%d) és "
@@ -6676,18 +8311,9 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "no es pot fer que el servidor escriga el DF per a l'agent\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "la contrasenya és massa llarga\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "la resposta de l'agent és invàlida\n"
 
-#~ 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"
-
 #~ msgid "select secondary key N"
 #~ msgstr "tria la clau secundària N"
 
@@ -6757,18 +8383,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ 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"
 
@@ -6778,49 +8392,18 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ 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 "|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 "|[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"
 
@@ -6844,15 +8427,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ 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"
@@ -6882,9 +8456,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "--nrlsign-key user-id"
 #~ msgstr "--nrlsign-key user-id"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "no s'ha pogut obrir %s: %s\n"
-
 #~ msgid "key %08lX: key has been revoked!\n"
 #~ msgstr "clau %08lX: aquesta clau ha estat revocada!\n"
 
@@ -7087,9 +8658,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- s'ha trobat una revocació falsa\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
-
 #~ msgid ""
 #~ "\"\n"
 #~ "locally signed with your key %08lX at %s\n"
@@ -7118,9 +8686,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\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"
 
@@ -7185,9 +8750,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ "s'està comprovant en profunditat %d signat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/"
 #~ "%d/%d\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: no s'ha pogut crear el directori: %s\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr ""
 #~ "Si voleu utilitzar aquesta clau revocada de totes maneres, dieu «sí»."
@@ -7260,9 +8822,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "no es pot fet això en mode desatès\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "no es pot obrir el fitxer: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "error: falten dos punts\n"
 
@@ -7365,13 +8924,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ "\n"
 
 #~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "No s'han trobat certificats amb confiança no definida.\n"
-#~ "\n"
-
-#~ msgid ""
 #~ "No trust values changed.\n"
 #~ "\n"
 #~ msgstr ""
@@ -7394,12 +8946,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "Do you really need such a large keysize? "
 #~ msgstr "Realment necessiteu una clau tan llarga? "
 
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: no s'ha trobat l'usuari: %s\n"
-
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "problema en la lectura del certificat: %s\n"
-
 #~ msgid "too many entries in unk cache - disabled\n"
 #~ msgstr ""
 #~ "massa entrades en la memòria cau de claus desconegudes - desactivada\n"
@@ -7410,9 +8956,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "key %08lX: our copy has no self-signature\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 "assuming bad MDC due to an unknown critical bit\n"
 #~ msgstr "es suposa MDC erroni a causa d'un bit crític desconegut\n"
 
@@ -7469,12 +9012,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "Invalid user ID revocation"
 #~ msgstr "Revocació d'ID d'usuari invàlida"
 
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Certificat de revocació vàlid"
-
-#~ msgid "Good certificate"
-#~ msgstr "Certificat correcte"
-
 #~ msgid "Invalid certificate revocation"
 #~ msgstr "Certificat de revocació invàlid"
 
@@ -7484,9 +9021,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "el registre de signatura %lu[%d] apunta a un registre incorrecte.\n"
 
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "certificat duplicat: esborrat"
-
 #~ msgid "tdbio_search_dir failed: %s\n"
 #~ msgstr "tdbio_search_dir ha fallat: %s\n"
 
@@ -7511,9 +9045,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "\t%lu due to new pubkeys\n"
 #~ msgstr "\\t%lu degut a noves claus públiques\n"
 
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu claus es descarta\n"
-
 #~ msgid "\t%lu keys updated\n"
 #~ msgstr "\t%lu clau actualitzades\n"
 
@@ -7557,9 +9088,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\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"
 
-#~ 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"
 
diff --git a/po/cs.po b/po/cs.po
index 7ae848cbb..833b636a6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -15,294 +15,723 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "nemohu vygenerovat prvo��slo s  pbits=%u qbits=%u\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "nelze zam��t `%s'\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "��dek je p��li� dlouh�"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "��dek je p��li� dlouh�"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Neplatn� znak ve jm�n�\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "�patn� MPI"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "�patn� heslo"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "�patn� heslo"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "zapisuji tajn� kl�� do `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "ochrann� algoritmus %d nen� podporov�n\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "nemohu pou��t p��kaz stat na `%s': %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' nen� norm�ln� soubor - ignoruji\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
+
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "pozn�mka: soubor random_seed je pr�zdn�\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "VAROV�N�: neplatn� velikost random_seed - soubor nepou�it\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "nemohu ��st `%s': %s\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't create `%s': %s\n"
-msgstr "nemohu vytvo�it `%s': %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:556 cipher/random.c:566
-#, c-format
-msgid "can't write `%s': %s\n"
-msgstr "nemohu zapisovat do `%s': %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "nemohu zav��t `%s': %s\n"
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "|A|PIN administr�tora"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "VAROV�N�: pou�it� gener�tor n�hodn�ch ��sel nen� bezpe�n�!!\n"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Opakujte tento PIN: "
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:278
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
+
+#: agent/divert-scd.c:290
+#, fuzzy, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
-"Gener�tor n�hodn�ch ��sel je pouze atrapa, aby program mohl b�et,\n"
-"v ��dn�m p��pad� nen� kryptograficky bezpe�n�!\n"
-"\n"
-"NEPOU��VEJTE JAK�KOLIV DATA VYTVO�EN� T�MTO PROGRAMEM!!\n"
+"Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "zm�nit heslo"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "zm�nit heslo"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\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"
+"@\n"
+"Mo�nosti:\n"
+" "
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
+
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "s dodate�n�mi informacemi"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "b�t o trochu v�c tich�"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "�tu mo�nosti z `%s'\n"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "vyhledat kl��e na serveru kl���"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "aktualizovat datab�zi d�v�ry"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "chyba p�i vytv��en� hesla: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr ""
+"Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
+"P�ipom�nky k p�ekladu <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
-"\n"
-"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/app-openpgp.c:596
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:609
+#: agent/gpg-agent.c:303
 #, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:977
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
 #, c-format
-msgid "reading public key failed: %s\n"
-msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
-msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
-msgstr "odpov�� neobsahuje RSA modulus\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
-msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
 #, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "funkce PIN callback zkon�ila chybou: %s\n"
+msgid "reading options from `%s'\n"
+msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
+msgid "error creating `%s': %s\n"
+msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
 #, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "verifikace CHV%d se nezda�ila: %s\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
-msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
-msgstr "chyba p�i z�sk�n� CHV z karty\n"
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
-msgstr "karta je trvale uzam�ena!\n"
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "aktualizace selhala: %s\n"
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "zapisuji tajn� kl�� do `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "directory `%s' created\n"
+msgstr "adres�� `%s' vytvo�en\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "fstat(%d) selhal v %s: %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "nemohu vytvo�it adres�� `%s': %s\n"
+
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
-"Do trval�ho uzam�en� karty z�st�v� %d pokus� o zad�n� PINu administr�tora\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
-msgstr "|A|PIN administr�tora"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
-msgstr "|AN|Nov� PIN administr�tora"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
-msgstr "|N|Nov� PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, fuzzy, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: p�esko�eno: %s\n"
+
+#: agent/gpg-agent.c:1650
+#, fuzzy
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
-msgid "error reading application data\n"
-msgstr "chyba p�i �ten� aplika�n�ch dat\n"
+#: agent/preset-passphrase.c:100
+#, fuzzy
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
-msgid "error reading fingerprint DO\n"
-msgstr "chyba p�i �ten� fingerpritnu DO\n"
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
-msgid "key already exists\n"
-msgstr "kl�� ji� existuje\n"
+#: agent/protect-tool.c:146
+#, fuzzy
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
-msgstr "existuj�c� kl�� bude p�eps�n\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1568
-msgid "generating new key\n"
-msgstr "generov�n� nov�ho kl��e\n"
+#: agent/protect-tool.c:1206
+#, fuzzy
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
-msgstr "chyb� �asov� raz�tko vytvo�en�\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+msgstr ""
+
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "�patn� heslo"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "chyba p�i vytv��en� hesla: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "zru�eno"
 
-#: g10/app-openpgp.c:1742
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "chyba v `%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "soubor s mo�nostmi `%s': %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "sch�z� RSA modulus nebo nem� velikost %d bit�\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "chyba p�i �ten� v `%s': %s\n"
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "sch�z� ve�ejn� RSA exponent nebo je del�� ne� %d bit�\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "sch�z� RSA prime %s nebo nem� velikost %d bit�\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
+msgstr ""
 
-#: g10/app-openpgp.c:1827
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
 #, c-format
-msgid "failed to store the key: %s\n"
-msgstr "nelze ulo�it kl��: %s\n"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
-msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
+#: agent/trustlist.c:453
+#, fuzzy
+msgid "Yes"
+msgstr "ano"
 
-#: g10/app-openpgp.c:1901
-msgid "generating key failed\n"
-msgstr "henerov�n� kl��e se nezda�ilo\n"
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
+#, fuzzy, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "chyba p�i vytv��en� hesla: %s\n"
+
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "nemohu otev��t podepsan� data '%s'\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
+#: common/exechelp.c:446
+#, fuzzy, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:452 common/exechelp.c:492
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "podpis %s, hashovac� algoritmus %s\n"
+msgid "error running `%s': exit status %d\n"
+msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "dosud vytvo�en� podpisy: %lu\n"
+msgid "error running `%s': probably not installed\n"
+msgstr ""
+
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "chyba p�i �ten� `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "chyba p�i vytv��en� `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[ID u�ivatele nenalezeno]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: g10/app-openpgp.c:2142
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
 msgstr ""
-"ov��en� administr�torsk�ho PIN je nyn� prost�ednictv�m tohoto p��kazu "
-"zak�z�no\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/simple-pwquery.c:389
+msgid "problem setting the gpg-agent options\n"
+msgstr ""
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "zru�eno u�ivatelem\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
 #, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
+msgid "can't disable core dumps: %s\n"
+msgstr "nemohu vypnout vytv��en� core soubor�: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr ""
+"VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "ano"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "aAyY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "ne"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "ukon�it"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "uUqQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr "okey|okey"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr "zru�it|zru�it"
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:115
+msgid "cC"
+msgstr "zZ"
 
 #: g10/armor.c:320
 #, c-format
@@ -379,163 +808,199 @@ msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dov�n� - pravd�podobn� byl pou�it "
 "�patn� MTA\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
+"a mus� kon�it znakem '='\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
+
+#: g10/build-packet.c:962
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "jm�no u�ivatele nesm� obsahovat v�ce ne� jeden znak '@' \n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "nen� v p��mo �iteln�m form�tu"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGp karta nen� dostupn�: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[nen� nastaven]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr "mu�"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr "�ena"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "neuvedeno"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr "nen� vy�adov�no"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr "vy�adov�no"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Chyba: V sou�asn� verzi je povolenou pouze plain ASCII.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak \"<\" nelze pou��t.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: V�ce mezer nen� povoleno.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr "P��jmen� dr�itele karty: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr "Jm�no (k�estn�) dr�itele karty: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Chyba: jm�no a p��jmen� je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr "Login (jm�nu ��tu): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Chyba: Login je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr "Priv�tn� DO data: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Chyba: Priv�tn� DO je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 msgid "Language preferences: "
 msgstr "Jazykov� p�edvolby: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatn� d�lka �etezce s p�edvolbami.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Zadejte pohlav�: M - mu�sk�, F - �ensk� nebo stisn�te mezern�k: "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s kl��em nen� mo�n�: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr "toto nen� OpenPGP karta"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "P�epsat existuj�c� kl��? (a/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Vytvo�it z�lohu �ifrovac�ho kl��e mimo kartu? (A/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr "P�epsat existuj�c� kl��e? (a/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -546,193 +1011,139 @@ msgstr ""
 "   PIN = `%s'     PIN administr�tora = `%s'\n"
 "Toto nastaven� m��ete zm�nit p��kazem --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovac� kl��\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �ifrovac� kl��\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m vyberte m�sto pro uchov�n� kl��e:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�m� algoritmus pro ochranu kl��e\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "vypi� v�echna dostupn� data"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "zm�n� jm�no majitele karty"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "zm�n� URL pro z�sk�n� kl��e"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "z�sk� kl�� specifikovan� v URL karty"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "zm�nit login name"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "zm�nit jazykov� p�edvolby"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "zm�n� pohlav� dr�itele karty"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint certifika�n� autority"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "zapnout/vypnout po�adov�n� PINu p�i ka�d� self-sign operaci"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr "ov�� PIN a vypi� v�echna data"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "pouze administr�torsk� p��kazy\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "administr�torsk� p��kazy jsou povoleny\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "tajn� kl�� nen� dostupn�"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr "Pros�m vo�te kartu a stiskn�te enter. Operaci zru��te stisknut�m 'z': "
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-"Pros�m vyjm�te kartu a vlo�te jinou se seriov�m ��slem:\n"
-"   %.*s\n"
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-"Je-li nov� karta p�ipravena, stiskn�te enter.  Operaci zru��te stisknut�m "
-"'z': "
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr "Vlo�te nov� PIN administr�tora: "
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr "Vlo�te nov� PIN: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr "Vlo�te PIN administr�tora: "
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr "Vlo�te PIN: "
-
-#: g10/cardglue.c:937
-msgid "Repeat this PIN: "
-msgstr "Opakujte tento PIN: "
-
-#: g10/cardglue.c:952
-msgid "PIN not correctly repeated; try again"
-msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output pro tento p��kaz nen� platn�\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -773,53 +1184,53 @@ 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/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v m�du S2K nelze pou��t symetrick� ESK paket\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "pou�it� �ifry: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�tu z `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -828,166 +1239,200 @@ msgstr ""
 "VAROV�N�: vy��dan� komprima�n� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, 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/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� data\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "VAROV�N�: zpr�va byla za�ifrov�na slab�m kl��em v symetrick� �if�e.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m se za�ifrovan�m paketem\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "spu�t�n� extern�ho programu nen� podporov�no\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "nemohu vytvo�it adres�� `%s': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 msgid "this platform requires temporary 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:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nelze spustit program `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nelze spustit shell `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "neo�ek�van� konec extern�ho programu\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "nelze spustit extern� program\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, 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:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROV�N�: nelze smazat do�asn� adres�� `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "pro \"%s\" nebyl nalezen ��dn� revoka�n� kl��\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "odstranit nepou�iteln� ��sti z kl��e"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 msgid "exporting secret keys not allowed\n"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kl�� %s: nen� chr�n�n� - p�esko�eno\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kl�� %s: PGP 2.x kl�� - p�esko�eno\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
+
+#: g10/getkey.c:176
+msgid "[User ID not found]"
+msgstr "[ID u�ivatele nenalezeno]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+# c-format
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
+
+#: g10/getkey.c:2612
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "pou��v�m podkl�� %s m�sto prim�rn�ho kl��e %s\n"
+
+#: g10/getkey.c:2659
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -995,127 +1440,128 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "zm�nit data na kart�"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "zm�nit PIN karty"
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1125,55 +1571,51 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 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/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "s dodate�n�mi informacemi"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1181,7 +1623,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1199,17 +1641,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 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/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1219,7 +1661,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1227,79 +1669,79 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
 # g10/g10.c:1179#, c-format
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1307,21 +1749,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
 "bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1329,7 +1771,7 @@ msgstr ""
 "VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
 "nastavena bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1337,543 +1779,484 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "soubor s mo�nostmi `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "�tu mo�nosti z `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, 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/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2826
-#, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "POZN�MKA: %s nen� v t�to verzi dostupn�\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpe�nou pam�t� vzhledem k %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 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/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 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/gpg.c:2986
+#: g10/gpg.c:3010
 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/gpg.c:2988
+#: g10/gpg.c:3012
 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/gpg.c:2991
+#: g10/gpg.c:3015
 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/gpg.c:2995
+#: g10/gpg.c:3019
 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/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 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/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
-
-#: g10/getkey.c:175
-msgid "[User ID not found]"
-msgstr "[ID u�ivatele nenalezeno]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-# c-format
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
-
-#: g10/getkey.c:2611
-#, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "pou��v�m podkl�� %s m�sto prim�rn�ho kl��e %s\n"
-
-#: g10/getkey.c:2658
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "b�t o trochu v�c tich�"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1881,7 +2264,7 @@ msgstr ""
 "Syntaxe: gpg [volby] [souboru]\n"
 "Ov��� podpisy proti zn�m�m, d�v�ryhodn�m kl���m\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1892,7 +2275,7 @@ msgstr ""
 "d�v�ry\"; nem� to nic spole�n�ho s (implicitn� vytvo�enou) \"pavu�inou\n"
 "certifik�t�\"."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1904,17 +2287,17 @@ msgstr ""
 "k tajn�m kl���m. Odpov�zte \"ano\", abyste nastavili tyto kl��e\n"
 "jako absolutn� d�v�ryhodn�\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1938,7 +2321,7 @@ msgstr ""
 "\n"
 "Prvn� (prim�rn�) kl�� mus� b�t v�dy kl��, pomoc� kter�ho lze podepisovat."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1948,16 +2331,16 @@ msgstr ""
 "Tento algoritmus je vhodn� pou��t jen za jist�ch podm�nek.\n"
 "Kontaktujte pros�m nejprve bezpe�nostn�ho specialistu."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Vlo�te d�lku kl��e"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpov�zte \"ano\" nebo \"ne\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1969,19 +2352,19 @@ msgstr ""
 "spr�vnou chybovou hl�ku - m�sto toho syst�m zkus� interpretovat\n"
 "zadanou hodnotu jako interval."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Vlo�te jm�no dr�itele kl��e"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 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:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Pros�m, vlo�te nepovinn� koment��"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1995,11 +2378,11 @@ msgstr ""
 "O  pro pokra�ov�n� generov�n� kl��e.\n"
 "Q  pro ukon�en� generov�n� kl��e."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2072,12 +2455,12 @@ msgstr ""
 "\n"
 "Pokud nev�te, jak� je spr�vn� odpov��, odpov�zte \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "Pokud chcete podepsat V�ECHNY identifik�tory u�ivatel�, odpov�zte \"ano\""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2086,11 +2469,11 @@ msgstr ""
 "\".\n"
 "V�echny certifik�ty budou tak� ztraceny!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Odpov�zte \"ano\", pokud chcete smazat podkl��"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2100,7 +2483,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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2112,13 +2495,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:211
+#: g10/helptext.c:213
 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:215
+#: g10/helptext.c:217
 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"
@@ -2131,7 +2514,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:223
+#: g10/helptext.c:225
 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"
@@ -2141,25 +2524,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:230
+#: g10/helptext.c:232
 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:236
+#: g10/helptext.c:238
 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 \n"
 " napsal(a)."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 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:245
+#: g10/helptext.c:247
 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:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2167,7 +2550,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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2195,7 +2578,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:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2205,11 +2588,11 @@ msgstr ""
 "ceritifik�tu. Pros�m, stru�n�. \n"
 "Text kon�� pr�zdn�m ��dkem.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Pomoc nen� k dispozici"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc nen� dostupn� pro '%s'"
@@ -2245,493 +2628,488 @@ msgstr "odstranit nepou�iteln� ��sti z kl��e"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl p�esko�en\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kl��e byly doposud zpracov�ny\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     p�esko�eny nov� kl��e: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez ID u�ivatele: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 importov�no: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                 beze zm�n: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� ID u�ivatel�: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             nov� podkl��e: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nov� podpisy: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       nov� revokace kl���: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      p�e�ten� tajn� kl��e: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "   importovan� tajn� kl��e: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "     tajn� kl��e nezm�n�ny: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             neimportov�no: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         odstran�n� podpisy: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " odstran�n� u�ivatelsk� ID: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, fuzzy, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr "VAROV�N�: kl�� %s obsahuje preference pro algoritmy,\n"
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "kter� nesjou k dispozici. T�k� se to t�chto user ID:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preference pro �ifrovac� algortimus %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preference pro podepisovac� algoritmus %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preference pro komprima�n� algoritmus %s\n"
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "velmi doporu�ujeme aktualiaci nastaven� va�ich preferenc� a\n"
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "distribuci tohoto kl��e aby jste p�ede�el probl�m�m s neshodou algoritm�\n"
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kl�� %s: PKS po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:764
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kl�� %s: p�ijat id u�ivatele \"%s\",kter� nen� podeps�n j�m sam�m\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kl�� %s: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 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:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kl�� %s: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kl�� %s: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kl�� %s: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kl�� %s: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kl�� %s: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kl�� %s: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kl�� %s: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podkl���\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kl�� %s: \"%s\" beze zm�n\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kl�� %s: tajn� kl�� importov�n\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kl�� %s: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kl�� %s: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "kl�� %s: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kl�� %s: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kl�� %s: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id  \"%s"
 "\"\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kl�� %s neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kl�� %s: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kl�� %s: neplatn� vazba podkl��e\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kl�� %s: neplatn� revoka�n� podkl��\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kl�� %s: p�esko�en identifik�tor u�ivatele \"%s\"\n"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kl�� %s: podkl�� p�esko�en\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kl�� %s: podpis nen� exportovateln� (t��da %02X) - p�esko�eno\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kl�� %s: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "POZN�MKA: S/N kl��e neodpov�d� S/N karty\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "POZN�MKA: prim�rn� kl�� je online a je ulo�en na kart�\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "POZN�MKA: sekund�rn� kl�� je online a je ulo�en na kart�\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "zdroj bloku kl��e `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[podpis kl��e j�m sam�m]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 �patn� podpis\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �patn�ch podpis�\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, 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:357
+#: g10/keyedit.c:358
 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:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2743,17 +3121,17 @@ msgstr ""
 "kontrolou fingerprint� z r�zn�ch zdroj�...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�v��uji ��ste�n�\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�v��uji �pln�\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2763,47 +3141,47 @@ msgstr ""
 "Hloubka v�t�� ne� 1 umo��uje kl���m, kter� jste podepsal\n"
 "podepsat jin� kl��, kter� bude pro V�s d�v�ryhodn�.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Pros�m vlo�te dom�nu, pro kterou je podpis omezen nebo stiskn�te enter pro "
 "podpis bez omezen� na dom�nu.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Vypr�ela platnost u�ivatelsk�ho ID \"%s\"."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, 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:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u�ivatele \"%s\" je p�ipraveno k podpisu."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "Podepsat? (a/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2812,11 +3190,11 @@ msgstr ""
 "Podpis kl��e \"%s\" j�m sam�m je\n"
 "podpis form�tu PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2826,13 +3204,13 @@ msgstr ""
 "vypr�ela.\n"
 "\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2842,54 +3220,54 @@ msgstr ""
 "je pouze lok�ln�.\n"
 "\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 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:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je ji� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nic k podeps�n� kl��em %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 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:891
+#: g10/keyedit.c:892
 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2899,31 +3277,31 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��ste�n� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, 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:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Va� v�b�r? (pro v�ce informac� vlo�te '?'): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2932,76 +3310,76 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em \"%s\" (%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Podpis bude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "K dispozici je jen kontroln� sou�et kl��e nebo je kl�� na kart� - passphrase "
 "nelze zm�nit.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� ��st prim�rn�ho kl��e jsou ulo�eny na kart�.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3009,11 +3387,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3021,186 +3399,186 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 msgid "Do you really want to do this? (y/N) "
 msgstr "Opravdu to chcete ud�lat? (a/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 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:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 msgid "show key fingerprint"
 msgstr "vypsat fingerprint kl��e"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "select subkey N"
 msgstr "vyberte podkl�� N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 msgid "check signatures"
 msgstr "kontrolovat podpisy"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "podepsat vybran� ID u�ivatele [* n��e jsou uvedeny relevantn� p��kazy]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 msgid "sign selected user IDs locally"
 msgstr "podepsat vybran� u�ivatelsk� ID lok�ln�"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "sign selected user IDs with a trust signature"
 msgstr "podepsat vybran� u�ivatelsk� ID d�v�ryhodn�m podpisem"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "podepsat vybran� u�ivatelsk� ID nerevokovateln�m podpisem"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 msgid "delete selected user IDs"
 msgstr "smazat vybran� ID u�ivatele"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 msgid "add a subkey"
 msgstr "p�idat podkl��y"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr "p�esunout z�lo�n� kl�� na kartu"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 msgid "delete selected subkeys"
 msgstr "smazat vybran� podkl��e"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 msgid "delete signatures from the selected user IDs"
 msgstr "smazat podpisy z vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "zm�nit datum expirace pro kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr "ozna�it vybran� u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 msgid "toggle between the secret and public key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 msgid "set preference list for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL preferovan�ho server kl��� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 msgid "revoke signatures on the selected user IDs"
 msgstr "revokovat podpisu na vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 msgid "revoke selected user IDs"
 msgstr "revokovat vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 msgid "revoke key or selected subkeys"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 msgid "enable key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 msgid "disable key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr "uk�zat vybran� fotografick� ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, 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:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3212,156 +3590,156 @@ msgstr ""
 "podpis\n"
 "  (nrsign) nebo libovolnou jejich kombinac�  (ltsign, tnrsign, atd.).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat v�echny id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Nezn�m� typ podpisu `%s'\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu p�esunout prim�rn� kl��? (a/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybrat pr�v� jeden kl��.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr "P��kaz o�ek�v� jm�no souboru jako argument\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nemohu otev��t `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Chyba p�i �ten� z�lo�n�ho kl��e z `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento kl��? (a/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu revokovat tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Opravdu chcete revokovat cel� kl��? (a/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Opravdu chcete revokovat vybran� podkl��e? (a/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete revokovat tento podkl��? (a/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "D�v�ryhodnost vlastn�ka nelze m�nit je-li pou��v�na datab�ze d�v�ry "
 "poskytnut� u�ivatelem\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam p�edvoleb:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? (a/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? (a/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 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:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3369,71 +3747,71 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "V %s tento kl�� revokoval %s kl��em %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kl�� m��e b�t revokov�n %s kl��em %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3441,17 +3819,17 @@ msgstr ""
 "Pros�m nezapome�te, �e zobrazovan� �daje o platnosti kl��� nemus�\n"
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3459,7 +3837,7 @@ 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:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3468,54 +3846,54 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 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:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "neplatn�"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3524,358 +3902,363 @@ 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:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 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:3520
+#: g10/keyedit.c:3521
 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:3526
+#: g10/keyedit.c:3527
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden podkl��.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu expirace podkl��e.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu expirace prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, 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:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete p�epsat? (a/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje u�ivatelsk� ID s hashem %s\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podkl�� s indexem %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podeps�no va��m kl��em %s v %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 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:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvo�it pro tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele: %s:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revokov�no va��m kl��em %s v %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 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:4922
+#: g10/keyedit.c:4923
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Kl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podkl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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�� %s (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita p�edvolby `%s'\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro �ifrov�n�\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro vzorkov�n�\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro komprimaci\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� polo�ka `%s' v �et�zci s p�edvolbami\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis kl��e j�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "zapisuji podpis kl��e sebou sam�m\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr "Podepisov�n�"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 msgid "Encrypt"
 msgstr "�ifrov�n�"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr "Autentizace"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Pro kl�� %s lze prov�st: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr "Aktu�ln� povolen� akce: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost �ifrovat\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r DSA kl��� DSA dlouh� %u bit�.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "kl�� %s m��e m�t d�lku v intervalu %u a� %u bit�.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "velikost kl��e %s mus� b�t v intervalu %u-%u\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3891,7 +4274,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:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3907,38 +4290,38 @@ 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:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� pro? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 msgid "Key does not expire at all\n"
 msgstr "Platnost kl��e nikdy neskon��\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon��\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost kl��e skon�� v %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�� v %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3946,11 +4329,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:1692
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3966,44 +4349,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4014,7 +4397,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
 
@@ -4029,25 +4412,25 @@ msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4055,12 +4438,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4072,7 +4455,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4085,50 +4468,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, 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:3072
+#: g10/keygen.c:3253
 #, 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:3095
+#: g10/keygen.c:3276
 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:3106
+#: g10/keygen.c:3287
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4136,12 +4519,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:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4149,7 +4532,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:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4157,30 +4540,30 @@ 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:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "ulo�en� kl��e na kartu se nezda�ilo: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: z�loha kl��e z karty ulo�ena do `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "nikdy     "
 
@@ -4208,622 +4591,595 @@ msgstr "Podepisovac� notace: "
 msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podkl��e:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 msgid "      Key fingerprint ="
 msgstr "      Fingerprint kl��e ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr "      Seriov� ��slo karty ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROV�N�: Existuj� dva soubory s tajn�mi informacemi.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je beze zm�ny\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "cache souboru kl��� `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kl��� ji� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kl��� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROV�N�: volba `%s' pro server kl��� nen� na t�to platform� ��inn�\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kl�� \"%s\" nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 msgid "key not found on keyserver\n"
 msgstr "kl�� nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�aduji kl�� %s ze %s server %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�aduji kl�� %s z %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "pos�l�m kl�� %s na %s server %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "pos�l�m kl�� %s na %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 msgid "no keyserver action!\n"
 msgstr "��dn� operace se serverem kl���!\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 msgid "keyserver timed out\n"
 msgstr "�asov� limit pro server kl��� vypr�el\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 msgid "keyserver internal error\n"
 msgstr "intern� chyba serveru kl���\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem kl���: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 kl�� z %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d kl��� z %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "podivn� velikost �ifrovac�ho kl��e pro sezen� (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s za�ifrovan� kl�� sezen�\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "heslo (passphraze) generov�no s pou�it�m nezn�m�ho algoritmu %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, c-format
 msgid "public key is %s\n"
 msgstr "ve�ejn� kl�� je %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 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:472
+#: g10/mainproc.c:444
 #, 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 %s, vytvo�en�m %s\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrov�no %s kl��em, ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrov�n� ve�ejn�m kl��em selhalo: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrov�no s heslem %lu\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrov�no jedn�m heslem\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "p�edpokl�d�m %s �ifrovan�ch dat\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 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:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se za�ifrovanou zpr�vou bylo manipulov�no!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 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:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvo�en %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               pou�it� %s kl��e %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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 %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "�PATN� podpis od \"%s\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "nemohu vypnout vytv��en� core soubor�: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat `%s' selhal na %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� algoritmus ve�ejn�ho kl��e %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� �ifrovac� algoritmus %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� hashovac� algoritmus %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VAROV�N�: vy��dan� algoritmus %s nen� doporu�en\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou��v�n� p��kaz \"%s\" se nedoporu�uje - nepou��vejte jej\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Soubor `%s' existuje. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 msgid "Overwrite? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nezn�m� p��pona\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Vlo�te nov� n�zev souboru"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "zapisuji do standardn�ho v�stupu\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "p�edpokl�d�m podepsan� data v `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "vytvo�en nov� konfigura�n� soubor `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, c-format
-msgid "directory `%s' created\n"
-msgstr "adres�� `%s' vytvo�en\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 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:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "nemohu se p�ipojit k `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
@@ -4887,7 +5243,7 @@ msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4901,38 +5257,34 @@ msgstr ""
 "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:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Vlo�te jm�no JPEG souboru s fotografick�m ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nelze otev��t JPEG soubor `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Tento JPEG je opravdu velk� (%d bajt�)!\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 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:146
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' nen� soubor ve form�tu JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je tato fotografie spr�vn� (a/N/u)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "nelze zobrazit photo ID!\n"
 
@@ -5204,61 +5556,56 @@ msgstr ""
 "data nebyla ulo�ena; k jejich ulo�en� pou�ijte parametr p��kazu \"--output"
 "\"\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "chyba p�i vytv��en� `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Podpis odd�len� od dokumentu.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zev datov�ho souboru: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "�tu standardn� vstup ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "chyb� podepsan� data\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonymn� adres�t; zkou��m tajn� kl�� %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my jsme anonymn� adres�t.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "star� k�dov�n� DEK nen� podporov�no\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "VAROV�N�: v p�edvolb�ch p��jemce nenalezen �ifrovac� algoritmus %s\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "POZN�MKA: platnost tajn�ho kl��e %s skon�ila %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
@@ -5378,89 +5725,89 @@ msgstr "(Nebyl zad�n ��dn� popis)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Je d�vod revokace vybr�n spr�vn�? (a/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nen� podporov�n\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, zkuste to znovu"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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:366
+#: g10/seckey-cert.c:406
 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/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "vytvo�en slab� kl�� - zkou��m znovu\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "nemohu se vyvarovat slab�ho kl��e pro symetrickou �ifru; operaci jsem zkusil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROV�N�: konflikt hashe podpisu ve zpr�v�\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s m� neplatnou k���ovou certifikaci\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5468,7 +5815,7 @@ msgstr ""
 "kl�� %s 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:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5476,53 +5823,53 @@ msgstr ""
 "kl�� %s 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:205
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "POZN�MKA: podpisov�mu kl��i %s skon�ila platnost %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, 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 %s, proto�e je nastaven nezn�m� kritick� "
 "bit\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci podkl��e\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kl�� %s: podkl�� kter� je sv�z�n s podpisem neexistuje\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5530,7 +5877,7 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL politiky (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5549,13 +5896,13 @@ msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\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:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5563,41 +5910,41 @@ msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kl�� nen� ozna�en jako nedostate�n� bezpe�n� - nemohu jej pou��t s pad�lan�m "
 "RNG!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "p�esko�en \"%s\": duplikov�n\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "p�esko�en \"%s\": %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "p�esko�eno: tajn� kl�� je u� v datab�zi\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "toto je PGP kl�� vygenerovan� podle algoritmu ElGamal,\n"
@@ -5653,51 +6000,51 @@ msgstr "chyba p�i �ten� v `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�ze d�v�ry: synchronizace selhala %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, 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:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "transakce s datab�z� d�v�ry je p��li� dlouh�\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adres�� neexistuje!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nemohu vytvo�it z�mek pro  `%s'\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "nelze zam��t `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepoda�ilo se vytvo�it z�znam verze: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvo�ena neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�ze d�v�ry vytvo�ena\n"
@@ -5706,78 +6053,78 @@ msgstr "%s: datab�ze d�v�ry vytvo�ena\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustedb nezle zapisovat\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba p�i aktualizaci z�znamu verze: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba p�i �ten� z�znamu verze: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, 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:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�v�ry: procedura lseek() selhala: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, 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:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nen� soubor datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verze s ��slem %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verze souboru %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba p�i �ten� voln�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, 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:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulov�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: p�id�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 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"
 
@@ -5786,7 +6133,7 @@ msgstr "datab�ze d�v�ry je po�kozena; pros�m spus�te \"gpg --fix-trustdb\".\n"
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nemohu pracovat s ��dky del��mi ne� %d znak�\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� ��dek je del�� ne� %d znak�\n"
@@ -5954,7 +6301,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat z�znam v datab�zi d�v�ry: chyba p�i z�pisu: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5964,341 +6311,1632 @@ 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:192
+#: g10/verify.c:195
 #, 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"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "obecn� chyba"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "nezn�m� typ paketu"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "nezn�m� verze"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "podeps�n� selhalo: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "nezn�m� algoritmus ve�ejn�ho kl��e"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "nezn�m� hashovac� algoritmus"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "�patn� ve�ejn� kl��"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "�patn� tajn� kl��"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr ""
+"Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
+"P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "�patn� podpis"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "chyba kontroln�ho sou�tu"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "�patn� heslo"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "ve�ejn� kl�� nenalezen"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "nezn�m� �ifrovac� algoritmus"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
+
+#: scd/app-openpgp.c:609
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "nemohu otev��t soubor kl���"
+#: scd/app-openpgp.c:1004
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "neplatn� paket"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "neplatn� zp�sob reprezentace v ASCII"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "neexistuje u�ivatel s t�mto id"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "tajn� kl�� nen� dostupn�"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "funkce PIN callback zkon�ila chybou: %s\n"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "je pou�it �patn� tajn� kl��"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "nepodporov�no"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "�patn� kl��"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "chyba p�i �ten� souboru"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "chyba p�i z�pisu souboru"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr "karta je trvale uzam�ena!\n"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "nezn�m� komprima�n� algoritmus"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+"Do trval�ho uzam�en� karty z�st�v� %d pokus� o zad�n� PINu administr�tora\n"
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "chyba p�i otv�r�n� souboru"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr "|A|PIN administr�tora"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "chyba p�i vytv��en� souboru"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr "|AN|Nov� PIN administr�tora"
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "nespr�vn� heslo"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr "|N|Nov� PIN"
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algoritmus ve�ejn�ho kl��e nen� implementov�n"
+#: scd/app-openpgp.c:1535
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "�ifrovac� algoritmus nen� implementov�n"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+msgid "error reading application data\n"
+msgstr "chyba p�i �ten� aplika�n�ch dat\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "nezn�m� t��da podpisu"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+msgid "error reading fingerprint DO\n"
+msgstr "chyba p�i �ten� fingerpritnu DO\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "chyba v datab�zi d�v�ry"
+#: scd/app-openpgp.c:1601
+msgid "key already exists\n"
+msgstr "kl�� ji� existuje\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "�patn� MPI"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr "existuj�c� kl�� bude p�eps�n\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "omezen� zdroj�"
+#: scd/app-openpgp.c:1607
+msgid "generating new key\n"
+msgstr "generov�n� nov�ho kl��e\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "neplatn� soubor kl���"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr "chyb� �asov� raz�tko vytvo�en�\n"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "�patn� certifik�t"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "sch�z� RSA modulus nebo nem� velikost %d bit�\n"
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "�patn� form�t id u�ivatele"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "sch�z� ve�ejn� RSA exponent nebo je del�� ne� %d bit�\n"
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "chyba p�i zav�r�n� souboru"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "sch�z� RSA prime %s nebo nem� velikost %d bit�\n"
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "chyba p�i p�ejmenov�n� souboru"
+#: scd/app-openpgp.c:1866
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "nelze ulo�it kl��: %s\n"
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "chyba p�i maz�n� souboru"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "neo�ek�van� data"
+#: scd/app-openpgp.c:1939
+msgid "generating key failed\n"
+msgstr "henerov�n� kl��e se nezda�ilo\n"
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "konflikt �asov�ho raz�tka"
+#: scd/app-openpgp.c:1942
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "nepou�iteln� algoritmus s ve�ejn�m kl��em"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "soubor existuje"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "slab� kl��"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "neplatn� argument"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "�patn� URI"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"ov��en� administr�torsk�ho PIN je nyn� prost�ednictv�m tohoto p��kazu "
+"zak�z�no\n"
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "toto URI nen� podporov�no"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "chyba s�t�"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "neza�ifrov�no"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "�tu mo�nosti z `%s'\n"
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "nezpracov�no"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "nepou�iteln� ve�ejn� kl��"
+#: scd/scdaemon.c:122
+msgid "|NAME|use NAME as ct-API driver"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "nepou�iteln� tajn� kl��"
+#: scd/scdaemon.c:123
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr ""
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "chyba serveru kl���"
+#: scd/scdaemon.c:126
+msgid "do not use the internal CCID driver"
+msgstr ""
 
-#: util/errors.c:109
-msgid "canceled"
-msgstr "zru�eno"
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
-msgid "no card"
-msgstr "��dn� karta"
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "zobraz administr�torsk� p��kazy"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "chyb� podepsan� data\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: util/logger.c:158
-msgid "ERROR: "
-msgstr "CHYBA: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
-msgstr "VAROV�N�: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... toto je chyba v programu (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "nalezena chyba v programu ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "ano"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "aAyY"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "Nemohu otev��t `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "nelze ulo�it kl��: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "POZN�MKA: kl�� byl revokov�n"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "�patn� certifik�t"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Kl�� k dispozici na: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "vytvo�it revoka�n� certifik�t"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Platnost kl��e vypr�ela!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "CA fingerprint: "
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "verifikovat podpis"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+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"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "ne"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "[nen� nastaven]"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "Chyba: neplatn� odpov��.\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "Chyba: neplatn� odpov��.\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Pot�ebujete heslo, abyste odemknul(a) tajn� kl�� pro u�ivatele:\n"
+"\"%.*s\"\n"
+"Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "neplatn� hashovac� algoritmus `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Neplatn� e-mailov� adresa\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "tajn� kl�� \"%s\" nenalezen: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "chyba p�i �ten� bloku kl��e: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "Revoka�n� certifik�t vytvo�en.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "duplicita p�edvolby `%s'\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(Nebyl zad�n ��dn� popis)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "chyba p�i vytv��en� hesla: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[soubor]|vytvo�it podpis"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "vypsat seznam tajn�ch kl���"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "�patn� certifik�t"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "�patn� certifik�t"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "�patn� certifik�t"
+
+#: sm/gpgsm.c:263
+#, fuzzy
+msgid "register a smartcard"
+msgstr "p�idat kl�� na kartu"
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "zm�nit heslo"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr ""
+
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "use the default key as default recipient"
+msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "force v3 signatures"
+msgstr "kontrolovat podpisy"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr ""
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr ""
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:351
+#, fuzzy
+msgid "add this keyring to the list of keyrings"
+msgstr "ber kl��e z t�to kl��enky (keyringu)"
+
+#: sm/gpgsm.c:352
+#, fuzzy
+msgid "add this secret keyring to the list"
+msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr ""
+
+#: sm/gpgsm.c:355
+#, fuzzy
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|JM�NO|�ifrovat pro JM�NO"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr ""
+
+#: sm/gpgsm.c:380
+#, fuzzy
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "nezn�m� �ifrovac� algoritmus"
+
+#: sm/gpgsm.c:382
+#, fuzzy
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "podpis %s, hashovac� algoritmus %s\n"
+
+#: sm/gpgsm.c:384
+#, fuzzy
+msgid "|N|use compress algorithm N"
+msgstr "nezn�m� komprima�n� algoritmus"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Syntaxe: gpg [mo�nosti] [soubory]\n"
+"podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
+"implicitn� operace z�vis� na vstupn�ch datech\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "u�it�: gpg [mo�nosti]"
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "nemohu se p�ipojit k `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "nemohu otev��t `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "vytvo�it revoka�n� certifik�t"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "chyba p�i vytv��en� hesla: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "chyba p�i �ten� `%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "nelze ulo�it kl��: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
+
+#: sm/keydb.c:1392
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "chyba p�i �ten� `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Podpis vytvo�en %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Dobr� podpis od \"%s\""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                alias \"%s\""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "ukon�it"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "uUqQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
-msgstr "okey|okey"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
-msgstr "zru�it|zru�it"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
+msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
-msgstr "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
+msgstr ""
 
-#: util/miscutil.c:411
-msgid "cC"
-msgstr "zZ"
+#: tools/gpg-connect-agent.c:126
+#, fuzzy
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "VAROV�N�: Pou��van� pam� nen� bezpe�n�!\n"
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
 
-#: util/secmem.c:98
-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"
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
 
-#: util/secmem.c:352
-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"
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "��dek je p��li� dlouh�"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "nezn�m� volba `%s'\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "podeps�n� selhalo: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "chyba p�i �ten� `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
 
-#~ 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"
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "u�it�: gpg [mo�nosti]"
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "ve�ejn� kl�� nenalezen"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@P��kazy:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "de�ifrov�n� o.k.\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "de�ifrov�n� o.k.\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [jm�no souboru]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "Nen� dovoleno pou��vat %s s %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "fstat `%s' selhal na %s: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "nemohu vytvo�it adres�� `%s': %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "chyba p�i �ten� `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "chyba v `%s': %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "spu�t�n� extern�ho programu nen� podporov�no\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "nemohu vytvo�it `%s': %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "nemohu vytvo�it `%s': %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "aktualizace selhala: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "aktualizace selhala: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "aktualizace selhala: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "aktualizace selhala: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "ochrann� algoritmus %d nen� podporov�n\n"
+
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "nemohu vygenerovat prvo��slo s  pbits=%u qbits=%u\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "nemohu vygenerovat prvo��slo s m�n� ne� %d bity\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "nelze zam��t `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "zapisuji tajn� kl�� do `%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "nemohu pou��t p��kaz stat na `%s': %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' nen� norm�ln� soubor - ignoruji\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "pozn�mka: soubor random_seed je pr�zdn�\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "VAROV�N�: neplatn� velikost random_seed - soubor nepou�it\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "nemohu ��st `%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "nemohu zapisovat do `%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "nemohu zav��t `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "VAROV�N�: pou�it� gener�tor n�hodn�ch ��sel nen� bezpe�n�!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "v�ce informac� naleznete v dokumentu http://www.gnupg.cz/why-not-idea."
-#~ "html\n"
+#~ "Gener�tor n�hodn�ch ��sel je pouze atrapa, aby program mohl b�et,\n"
+#~ "v ��dn�m p��pad� nen� kryptograficky bezpe�n�!\n"
+#~ "\n"
+#~ "NEPOU��VEJTE JAK�KOLIV DATA VYTVO�EN� T�MTO PROGRAMEM!!\n"
+#~ "\n"
+
+#~ 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"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "\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 ""
-#~ "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo "
-#~ "podtr��tka a mus� kon�it znakem '='\n"
+#~ "\n"
+#~ "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"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "tajn� kl�� nen� dostupn�"
+
+#~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
+#~ msgstr ""
+#~ "Pros�m vo�te kartu a stiskn�te enter. Operaci zru��te stisknut�m 'z': "
+
+#~ msgid ""
+#~ "Please remove the current card and insert the one with serial number:\n"
+#~ "   %.*s\n"
+#~ msgstr ""
+#~ "Pros�m vyjm�te kartu a vlo�te jinou se seriov�m ��slem:\n"
+#~ "   %.*s\n"
+
+#~ msgid "Hit return when ready or enter 'c' to cancel: "
+#~ msgstr ""
+#~ "Je-li nov� karta p�ipravena, stiskn�te enter.  Operaci zru��te stisknut�m "
+#~ "'z': "
+
+#~ msgid "Enter New Admin PIN: "
+#~ msgstr "Vlo�te nov� PIN administr�tora: "
+
+#~ msgid "Enter New PIN: "
+#~ msgstr "Vlo�te nov� PIN: "
+
+#~ msgid "Enter Admin PIN: "
+#~ msgstr "Vlo�te PIN administr�tora: "
+
+#~ msgid "Enter PIN: "
+#~ msgstr "Vlo�te PIN: "
+
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "POZN�MKA: %s nen� v t�to verzi dostupn�\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "kter� nesjou k dispozici. T�k� se to t�chto user ID:\n"
+
+#~ msgid "general error"
+#~ msgstr "obecn� chyba"
+
+#~ msgid "unknown packet type"
+#~ msgstr "nezn�m� typ paketu"
+
+#~ msgid "unknown version"
+#~ msgstr "nezn�m� verze"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "nezn�m� algoritmus ve�ejn�ho kl��e"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "nezn�m� hashovac� algoritmus"
+
+#~ msgid "bad public key"
+#~ msgstr "�patn� ve�ejn� kl��"
+
+#~ msgid "bad secret key"
+#~ msgstr "�patn� tajn� kl��"
+
+#~ msgid "bad signature"
+#~ msgstr "�patn� podpis"
+
+#~ msgid "checksum error"
+#~ msgstr "chyba kontroln�ho sou�tu"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
+#~ msgid "can't open the keyring"
+#~ msgstr "nemohu otev��t soubor kl���"
 
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "jm�no u�ivatele nesm� obsahovat v�ce ne� jeden znak '@' \n"
+#~ msgid "invalid packet"
+#~ msgstr "neplatn� paket"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
+#~ msgid "invalid armor"
+#~ msgstr "neplatn� zp�sob reprezentace v ASCII"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
+#~ msgid "no such user id"
+#~ msgstr "neexistuje u�ivatel s t�mto id"
 
-#~ msgid "not human readable"
-#~ msgstr "nen� v p��mo �iteln�m form�tu"
+#~ msgid "secret key not available"
+#~ msgstr "tajn� kl�� nen� dostupn�"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "je pou�it �patn� tajn� kl��"
+
+#~ msgid "not supported"
+#~ msgstr "nepodporov�no"
+
+#~ msgid "bad key"
+#~ msgstr "�patn� kl��"
+
+#~ msgid "file read error"
+#~ msgstr "chyba p�i �ten� souboru"
+
+#~ msgid "file write error"
+#~ msgstr "chyba p�i z�pisu souboru"
+
+#~ msgid "file open error"
+#~ msgstr "chyba p�i otv�r�n� souboru"
+
+#~ msgid "file create error"
+#~ msgstr "chyba p�i vytv��en� souboru"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "nespr�vn� heslo"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algoritmus ve�ejn�ho kl��e nen� implementov�n"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "�ifrovac� algoritmus nen� implementov�n"
+
+#~ msgid "unknown signature class"
+#~ msgstr "nezn�m� t��da podpisu"
+
+#~ msgid "trust database error"
+#~ msgstr "chyba v datab�zi d�v�ry"
+
+#~ msgid "resource limit"
+#~ msgstr "omezen� zdroj�"
+
+#~ msgid "invalid keyring"
+#~ msgstr "neplatn� soubor kl���"
+
+#~ msgid "malformed user id"
+#~ msgstr "�patn� form�t id u�ivatele"
+
+#~ msgid "file close error"
+#~ msgstr "chyba p�i zav�r�n� souboru"
+
+#~ msgid "file rename error"
+#~ msgstr "chyba p�i p�ejmenov�n� souboru"
+
+#~ msgid "file delete error"
+#~ msgstr "chyba p�i maz�n� souboru"
+
+#~ msgid "unexpected data"
+#~ msgstr "neo�ek�van� data"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "konflikt �asov�ho raz�tka"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "nepou�iteln� algoritmus s ve�ejn�m kl��em"
+
+#~ msgid "file exists"
+#~ msgstr "soubor existuje"
+
+#~ msgid "weak key"
+#~ msgstr "slab� kl��"
+
+#~ msgid "invalid argument"
+#~ msgstr "neplatn� argument"
+
+#~ msgid "bad URI"
+#~ msgstr "�patn� URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "toto URI nen� podporov�no"
+
+#~ msgid "network error"
+#~ msgstr "chyba s�t�"
+
+#~ msgid "not encrypted"
+#~ msgstr "neza�ifrov�no"
+
+#~ msgid "not processed"
+#~ msgstr "nezpracov�no"
+
+#~ msgid "unusable public key"
+#~ msgstr "nepou�iteln� ve�ejn� kl��"
+
+#~ msgid "unusable secret key"
+#~ msgstr "nepou�iteln� tajn� kl��"
+
+#~ msgid "keyserver error"
+#~ msgstr "chyba serveru kl���"
+
+#~ msgid "no card"
+#~ msgstr "��dn� karta"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "chyb� podepsan� data\n"
+
+#~ msgid "ERROR: "
+#~ msgstr "CHYBA: "
+
+#~ msgid "WARNING: "
+#~ msgstr "VAROV�N�: "
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... toto je chyba v programu (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "VAROV�N�: Pou��van� pam� nen� bezpe�n�!\n"
+
+#~ 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"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
+
+#~ 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"
+
+#~ 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"
 
 #~ msgid "expired: %s)"
 #~ msgstr "platnost skon�ila: %s)"
diff --git a/po/da.po b/po/da.po
index ff553782c..e9e9aec1c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -16,296 +16,714 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
+# er det klogt at overs�tte TrustDB?
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "kunne ikke initialisere TillidsDB: %s\n"
+
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
 msgstr ""
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
+#: agent/call-pinentry.c:359
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr ""
+
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+msgid "PIN too long"
+msgstr ""
+
+#: agent/call-pinentry.c:418
+msgid "Passphrase too long"
 msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Ugyldige bogstaver i navn\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
 msgstr ""
 
-#: cipher/random.c:403
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "d�rlig mpi"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "d�rlig kodes�tning"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "d�rlig kodes�tning"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "kan ikke �bne `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: cipher/random.c:408
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "skriver hemmeligt certifikat til '%s'\n"
+msgid "can't create `%s': %s\n"
+msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:458
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
 #, fuzzy, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "kan ikke �bne '%s': %s\n"
+msgid "error getting serial number of card: %s\n"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
+msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
+
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
+
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: agent/command-ssh.c:2018
+#, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr ""
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
+#: agent/command-ssh.c:2353
+#, c-format
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: cipher/random.c:482
+# er det klogt at overs�tte TrustDB?
+#: agent/command-ssh.c:2857
 #, fuzzy, c-format
-msgid "can't read `%s': %s\n"
-msgstr "kan ikke �bne '%s': %s\n"
+msgid "failed to create stream from socket: %s\n"
+msgstr "kunne ikke initialisere TillidsDB: %s\n"
+
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "Indtast bruger-id: "
+
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Gentag kodes�tning: "
+
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
+#: agent/divert-scd.c:290
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: agent/genkey.c:109
 #, fuzzy, c-format
-msgid "can't create `%s': %s\n"
-msgstr "kan ikke oprette %s: %s\n"
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
+"\n"
 
-#: cipher/random.c:556 cipher/random.c:566
-#, fuzzy, c-format
-msgid "can't write `%s': %s\n"
-msgstr "kan ikke �bne '%s': %s\n"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "�ndr kodes�tningen"
 
-#: cipher/random.c:569
-#, fuzzy, c-format
-msgid "can't close `%s': %s\n"
-msgstr "kan ikke �bne '%s': %s\n"
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "�ndr kodes�tningen"
 
-#: cipher/random.c:815
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Indstillinger:\n"
+" "
+
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
+
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "meddelsom"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "v�r mere stille"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
 msgstr ""
-"Den tilf�ldige nummer generator er kun en \"kludge\" for at\n"
-"lade den k�re - det er ikke en st�rk RNG!\n"
-"\n"
-"BENYT IKKE DATA GENERERET AF DETTE PROGRAM!!!\n"
-"\n"
 
-#: cipher/rndegd.c:202
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|indl�s udvidelsesmodul FILE"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "eksport�r n�gler til en n�gletjener"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "Gener�r en annull�rbar certifikat"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "opdat�r tillidsdatabasen"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
 
-#: cipher/rndlinux.c:132
+#: agent/gpg-agent.c:300
 #, 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"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
-"\n"
-"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"
 
-# er det klogt at overs�tte TrustDB?
-#: g10/app-openpgp.c:596
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
+
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOTITS: ingen standard alternativfil '%s'\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "alternativfil`%s': %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "l�ser indstillinger fra `%s'\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "kunne ikke initialisere TillidsDB: %s\n"
+msgid "error creating `%s': %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/app-openpgp.c:609
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
 #, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "ingen standard offentlig n�glering\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: kan ikke oprette mappe: %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
+msgstr ""
 
-#: g10/app-openpgp.c:977
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
 #, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "fjernelse af beskyttelse fejlede: %s\n"
+msgid "can't create socket: %s\n"
+msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "signering fejlede: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: mappe oprettet\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: kan ikke oprette mappe: %s\n"
+
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:1451
 #, c-format
-msgid "PIN callback returned error: %s\n"
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
 #, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+msgid "%s %s stopped\n"
+msgstr "%s: udelod: %s\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:1650
+msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, fuzzy, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "valgte cifferalgoritme %d er ugyldig\n"
+
+#: agent/preset-passphrase.c:100
+#, fuzzy
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
-#, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+#: agent/protect-tool.c:146
+#, fuzzy
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
+
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/protect-tool.c:1206
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/protect-tool.c:1209
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/protect-tool.c:1217
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr ""
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "d�rlig kodes�tning"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
+msgid "error while asking for the passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
-#, fuzzy
-msgid "error reading application data\n"
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+msgid "cancelled\n"
+msgstr ""
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
-#, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "fejl i trailerlinie\n"
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/app-openpgp.c:1562
-#, fuzzy
-msgid "key already exists\n"
-msgstr "fjern n�gle fra den hemmelige n�glering"
+#: agent/trustlist.c:144 agent/trustlist.c:152
+#, c-format
+msgid "statement \"%s\" ignored in `%s', line %d\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "hemmelig n�gle ikke tilg�ngelig"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "panser: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
+#, c-format
+msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
-#, fuzzy
-msgid "generating new key\n"
-msgstr "gener�r et nyt n�glepar"
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/trustlist.c:453
+#, fuzzy
+msgid "Yes"
+msgstr "ja"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
+#, fuzzy, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-# er det klogt at overs�tte TrustDB?
-#: g10/app-openpgp.c:1827
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "kunne ikke initialisere TillidsDB: %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: common/exechelp.c:487
+#, c-format
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
-#, fuzzy
-msgid "generating key failed\n"
-msgstr "fjernelse af beskyttelse fejlede: %s\n"
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/app-openpgp.c:1904
+#: common/http.c:1622
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "N�gleoprettelse annulleret.\n"
+msgid "error creating socket: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "%s: bruger ikke fundet\n"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s signatur fra: %s\n"
+msgid "can't connect to `%s': %s\n"
+msgstr "kan ikke �bne '%s': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr ""
 
-#: g10/app-openpgp.c:2134
+#: common/simple-pwquery.c:389
+msgid "problem setting the gpg-agent options\n"
+msgstr ""
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+msgid "canceled by user\n"
+msgstr ""
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+msgid "problem with the agent\n"
+msgstr ""
+
+#: common/sysutils.c:88 g10/misc.c:137
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "can't disable core dumps: %s\n"
+msgstr "kan ikke sl� core-dump fra: %s\n"
+
+#: common/sysutils.c:183
+#, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/sysutils.c:215
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "ja"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "jJ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "n"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "afslut"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "aA"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "ingen gyldig OpenPGP data fundet.\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr ""
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: g10/armor.c:320
 #, c-format
@@ -382,176 +800,213 @@ 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/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+
+#: g10/build-packet.c:956
+#, fuzzy
+msgid "a user notation name must contain the '@' character\n"
+msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+#, fuzzy
+msgid "WARNING: invalid notation data found\n"
+msgstr "ingen gyldig OpenPGP data fundet.\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr ""
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "sl�til"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "sl�til"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "ikke bearbejdet"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -559,210 +1014,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "hemmelig n�gle ikke tilg�ngelig"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "fjernelse af beskyttelse fejlede: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-#, fuzzy
-msgid "Enter New Admin PIN: "
-msgstr "Indtast bruger-id: "
-
-#: g10/cardglue.c:918
-#, fuzzy
-msgid "Enter New PIN: "
-msgstr "Indtast bruger-id: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/cardglue.c:920
-#, fuzzy
-msgid "Enter PIN: "
-msgstr "Indtast bruger-id: "
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Gentag kodes�tning: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
-
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr ""
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -803,213 +1203,247 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "l�ser fra '%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, fuzzy, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "%s: kan ikke oprette mappe: %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr ""
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:69
 msgid "remove the passphrase from exported subkeys"
 msgstr ""
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "d�rlig hemmelig n�gle"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr ""
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[bruger ikke fundet]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr ""
+
+#: g10/getkey.c:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
+
+#: g10/getkey.c:2659
+#, 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/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1017,132 +1451,133 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1152,57 +1587,53 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "meddelsom"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1222,16 +1653,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 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/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1241,7 +1672,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1249,661 +1680,602 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "alternativfil`%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "l�ser indstillinger fra `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "RSA n�gle kan ikke bruges i denne version\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:2986
+#: g10/gpg.c:3010
 #, 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/gpg.c:2988
+#: g10/gpg.c:3012
 #, 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr ""
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[bruger ikke fundet]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr ""
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr ""
-
-#: g10/getkey.c:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
-
-#: g10/getkey.c:2658
-#, 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/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "v�r mere stille"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "tidsstempelkonflikt"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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:55
+#: g10/helptext.c:57
 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"
@@ -1911,16 +2283,16 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:66
+#: g10/helptext.c:68
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1934,23 +2306,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svar \"ja\" eller \"nej\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1958,19 +2330,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1979,11 +2351,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:148
+#: g10/helptext.c:150
 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"
@@ -2024,28 +2396,28 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2053,13 +2425,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2068,30 +2440,30 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svar \"ja\" hvis det er ok at overskrive filen"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2099,7 +2471,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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2115,18 +2487,18 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 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:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
@@ -2161,490 +2533,485 @@ msgstr "d�rlig hemmelig n�gle"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "      nye bruger-id'er: %lu\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, 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:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, 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:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, 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:1276
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, fuzzy, c-format
 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:1391
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, 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:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, 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:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, 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:1802
+#: g10/import.c:1801
 #, 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:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2652,466 +3019,466 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 #, 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:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 #, 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:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 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:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3119,172 +3486,172 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ukendt signaturklasse"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3292,524 +3659,529 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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:3011
+#: g10/keyedit.c:3012
 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 #, 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:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 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:3352
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3373
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 #, 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:3453
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3460
 #, 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, 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:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 #, 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:4639
+#: g10/keyedit.c:4640
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign�r"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "krypt�r data"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 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:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3819,7 +4191,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3829,52 +4201,52 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 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:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3884,44 +4256,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3932,7 +4304,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3947,24 +4319,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 #, 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3972,12 +4344,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -3985,7 +4357,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -3993,97 +4365,97 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, 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:3047
+#: g10/keygen.c:3228
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr ""
 
@@ -4113,633 +4485,606 @@ msgstr ""
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "sl�fra"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ukendt cifferalgoritme "
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "krypt�r data"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 #, fuzzy
 msgid "Key available at: "
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "kan ikke sl� core-dump fra: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "uimplementeret cifferalgoritme"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fil `%s' eksisterer. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ukendt suffiks\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Indtast nyt filnavn"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr ""
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: mappe oprettet\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr ""
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr ""
-
-#: g10/passphrase.c:345
-#, fuzzy, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "valgte cifferalgoritme %d er ugyldig\n"
-
-#: g10/passphrase.c:362
-#, fuzzy, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "kan ikke �bne '%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
@@ -4802,7 +5147,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4811,41 +5156,37 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, 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:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
 # virker j automatisk istedetfor y?
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "kan ikke �bne %s: %s\n"
@@ -5125,61 +5466,56 @@ msgstr "ingen gyldige adresser\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, fuzzy, c-format
-msgid "error creating `%s': %s\n"
-msgstr "fejl ved l�sning af '%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
@@ -5299,146 +5635,146 @@ msgstr ""
 msgid "Is this okay? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, fuzzy, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "ugyldig kodes�tning"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr ""
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 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:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 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:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, 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:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:132
+#: g10/sign.c:133
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5455,49 +5791,49 @@ msgstr "Kan ikke tjekke signatur: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
@@ -5551,51 +5887,51 @@ msgstr "panser: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
@@ -5604,78 +5940,78 @@ msgstr ""
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
@@ -5684,7 +6020,7 @@ msgstr ""
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
@@ -5852,334 +6188,1587 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 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:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "generel fejl"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "du fandt en fejl ... (%s:%d)\n"
+
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
+
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr "s�t aflusningsflag"
+
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr "sl� fuld fejltjekning til"
+
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
+
+#: kbx/kbxutil.c:108
+msgid ".\n"
+msgstr ""
+
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
+
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
+
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
+
+# er det klogt at overs�tte TrustDB?
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "kunne ikke initialisere TillidsDB: %s\n"
+
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "ingen standard offentlig n�glering\n"
+
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
+
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "ukendt pakketype"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "fejl i trailerlinie\n"
+
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "fjern n�gle fra den hemmelige n�glering"
+
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "gener�r et nyt n�glepar"
+
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+# er det klogt at overs�tte TrustDB?
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "kunne ikke initialisere TillidsDB: %s\n"
+
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
+
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "N�gleoprettelse annulleret.\n"
+
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s signatur fra: %s\n"
+
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "ingen gyldig OpenPGP data fundet.\n"
+
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
+
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "l�ser indstillinger fra `%s'\n"
+
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
+
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAME|brug NAME som standard modtager"
+
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAME|brug NAME som standard modtager"
+
+#: scd/scdaemon.c:126
+#, fuzzy
+msgid "do not use the internal CCID driver"
+msgstr "brug overhovedet ikke terminalen"
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
+
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "konfliktende kommandoer\n"
+
+#: scd/scdaemon.c:191
+#, fuzzy
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
+
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
+
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
+
+#: scd/scdaemon.c:1008
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr ""
+
+#: scd/scdaemon.c:1013
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr ""
+
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "ugyldigt radix64 tegn %02x udeladt\n"
+
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
+
+#: sm/call-dirmngr.c:216
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr ""
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "valgte cifferalgoritme %d er ugyldig\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "valgte cifferalgoritme %d er ugyldig\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "kan ikke �bne '%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+# er det klogt at overs�tte TrustDB?
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "kunne ikke initialisere TillidsDB: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "Godt certifikat"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Ingen hj�lp tilg�ngelig"
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "Kan ikke tjekke signatur: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Godt certifikat"
+
+#: sm/certchain.c:713
+#, fuzzy, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "certifikatl�seproblem: %s\n"
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "certifikatl�seproblem: %s\n"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "Fingeraftryk:"
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "Kan ikke tjekke signatur: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+#, fuzzy
+msgid "certificate chain too long\n"
+msgstr "certifikatl�seproblem: %s\n"
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "godkend en signatur"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
+msgstr "n"
+
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
 msgstr "ukendt version"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "ukendt offentlig n�glealgoritme"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "fejl i trailerlinie\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "ukendt sammenfatningsalgoritme"
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "d�rlig offentlig n�gle"
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "d�rlig hemmelig n�gle"
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "fejl i trailerlinie\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "d�rlig signatur"
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
+"\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "tjeksumsfejl"
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "d�rlig kodes�tning"
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "offentlig n�gle ikke fundet"
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "ukendt cifferalgoritme "
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "kan ikke �bne n�gleringen"
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "ugyldig pakke"
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "ugyldig rustning"
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "ikke-eksisterende bruger id"
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "hemmelig n�gle ikke tilg�ngelig"
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "forkert hemmelig n�gle brugt"
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "ikke underst�ttet"
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "d�rlig n�gle"
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "fill�sningsfejl"
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "filskrivningsfejl"
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Ikke en gyldig epostadresse\n"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "ukendt kompressionsalgoritme"
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "fil�bningsfejl"
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "filoprettelsesfejl"
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "ugyldig kodes�tning"
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "uimplementeret offentlig n�glealgoritme"
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "%s: bruger ikke fundet: %s\n"
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "uimplementeret cifferalgoritme"
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "ukendt signaturklasse"
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "tillidsdatabasefejl"
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "vis pr�ferencer"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "d�rlig mpi"
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "resursegr�nse"
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "ingen gyldige adresser\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "ugyldig n�glering"
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "skriver til `%s'\n"
 
-#: util/errors.c:88
-msgid "bad certificate"
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[filer]|opret en signatur"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[filer]|opret rentekst signatur"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "vis hemmelige n�gler"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
 msgstr "ugyldigt certifikat"
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "d�rlig bruger-id"
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "fillukningsfejl"
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "Godt certifikat"
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "filomd�bningsfejl"
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "Godt certifikat"
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "filsletningsfejl"
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "uforventet data"
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "tidsstempelkonflikt"
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "�ndr kodes�tningen"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "opret ascii beskyttet uddata"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "uanvendelig offentlig n�glealgoritme"
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "fil eksisterer"
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "svag n�gle"
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "ugyldigt argument"
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "ugyldig URI"
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "ikke-underst�ttet URI"
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "netv�rksfejl"
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "ikke krypteret"
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "ikke bearbejdet"
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
 
-#: util/errors.c:106
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NAME|brug NAME som standard modtager"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "brug standard n�glen som standard modtager"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "brug overhovedet ikke terminalen"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "tving v3 signaturer"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "brug altid en MDC for kryptering"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "k�rselsmodus: sp�rg aldrig"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "forvent ja til de fleste spr�gsm�l"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "forvent nej til de fleste spr�gsm�l"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "tilf�j denne n�glering til n�gleringslisten"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "tilf�j denne hemmeligen�glering til listen"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|brug NAME som standard hemmelign�gle"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NAME|s�t terminal karakters�t til NAME"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|FILE|indl�s udvidelsesmodul FILE"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|brug cifferalgoritme NAME"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|brug kompresalgoritme N"
+
+#: sm/gpgsm.c:520
 #, fuzzy
-msgid "unusable public key"
-msgstr "d�rlig offentlig n�gle"
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: util/errors.c:107
+# Skal alt dette overs�ttes eller er det flagene?
+#: sm/gpgsm.c:523
 #, fuzzy
-msgid "unusable secret key"
-msgstr "d�rlig hemmelig n�gle"
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Syntaks: gpg [flag] [filer]\n"
+"sign, check, encrypt eller decrypt\n"
+"standard operation afh�nger af inddata\n"
 
-#: util/errors.c:108
+#: sm/gpgsm.c:617
 #, fuzzy
-msgid "keyserver error"
-msgstr "generel fejl"
+msgid "usage: gpgsm [options] "
+msgstr "brug: gpg [flag] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "kan ikke �bne '%s': %s\n"
 
-#: util/errors.c:109
-msgid "canceled"
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "skriver til `%s'\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "kan ikke �bne '%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: util/errors.c:110
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Totalt antal behandlede: %lu\n"
+
+#: sm/import.c:227
 #, fuzzy
-msgid "no card"
-msgstr "ikke krypteret"
+msgid "error storing certificate\n"
+msgstr "Godt certifikat"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: util/errors.c:111
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "%s: mappe oprettet\n"
+
+# er det klogt at overs�tte TrustDB?
+#: sm/keydb.c:1304 sm/keydb.c:1370
 #, fuzzy
-msgid "no data"
-msgstr "krypt�r data"
+msgid "failed to get the fingerprint\n"
+msgstr "kunne ikke initialisere TillidsDB: %s\n"
+
+# er det klogt at overs�tte TrustDB?
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "kunne ikke initialisere TillidsDB: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: sm/keydb.c:1392
+#, c-format
+msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: util/logger.c:224
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "fejl i trailerlinie\n"
+
+#: sm/qualified.c:131
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... dette er en fejl (%s:%d:%s)\n"
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
 
-#: util/logger.c:230
+#: sm/qualified.c:224
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "du fandt en fejl ... (%s:%d)\n"
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "ja"
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "jJ"
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
-msgstr "n"
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "God signatur fra \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "              alias \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "afslut"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "aA"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "ukendt standard modtager '%s'\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "signering fejlede: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
 
-#: util/secmem.c:97
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
 #, fuzzy
-msgid "WARNING: using insecure memory!\n"
-msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
+msgid "Options useful for debugging"
+msgstr "sl� fuld fejltjekning til"
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operation er ikke mulig uden beskyttet hukommelse indl�st\n"
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(du kan have brugt et forkert program til denne opgave)\n"
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
 
+#: tools/gpgconf.c:176
 #, fuzzy
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
+msgid "usage: gpgconf [options] "
+msgstr "brug: gpg [flag] "
 
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
+msgid "Component not found"
+msgstr "offentlig n�gle ikke fundet"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Kommandoer:\n"
+" "
+
+#: tools/symcryptrun.c:172
+msgid "decryption modus"
+msgstr ""
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "krypt�r data"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [filnavn (som gemmes)]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s ikke tilladt med %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "%s: kan ikke oprette mappe: %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: tools/symcryptrun.c:542
+msgid "no --program option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "kan ikke oprette %s: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "kan ikke oprette %s: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "signering fejlede: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "kan ikke oprette %s: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "kan ikke oprette %s: %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "valgte cifferalgoritme %d er ugyldig\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "kan ikke �bne `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "skriver hemmeligt certifikat til '%s'\n"
+
+#, fuzzy
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "kan ikke �bne '%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "kan ikke �bne '%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "kan ikke �bne '%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "kan ikke �bne '%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
+
+#~ 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 ""
+#~ "Den tilf�ldige nummer generator er kun en \"kludge\" for at\n"
+#~ "lade den k�re - det er ikke en st�rk RNG!\n"
+#~ "\n"
+#~ "BENYT IKKE DATA GENERERET AF DETTE PROGRAM!!!\n"
+#~ "\n"
+
+#~ 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"
+#~ "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"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "hemmelig n�gle ikke tilg�ngelig"
+
+#, fuzzy
+#~ msgid "Enter New PIN: "
+#~ msgstr "Indtast bruger-id: "
+
+#, fuzzy
+#~ msgid "Enter PIN: "
+#~ msgstr "Indtast bruger-id: "
+
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "RSA n�gle kan ikke bruges i denne version\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "      nye bruger-id'er: %lu\n"
+
+#~ msgid "general error"
+#~ msgstr "generel fejl"
+
+#~ msgid "unknown packet type"
+#~ msgstr "ukendt pakketype"
+
+#~ msgid "unknown version"
+#~ msgstr "ukendt version"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "ukendt offentlig n�glealgoritme"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "ukendt sammenfatningsalgoritme"
+
+#~ msgid "bad public key"
+#~ msgstr "d�rlig offentlig n�gle"
+
+#~ msgid "bad secret key"
+#~ msgstr "d�rlig hemmelig n�gle"
+
+#~ msgid "bad signature"
+#~ msgstr "d�rlig signatur"
+
+#~ msgid "checksum error"
+#~ msgstr "tjeksumsfejl"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "ukendt cifferalgoritme "
+
+#~ msgid "can't open the keyring"
+#~ msgstr "kan ikke �bne n�gleringen"
+
+#~ msgid "invalid packet"
+#~ msgstr "ugyldig pakke"
+
+#~ msgid "invalid armor"
+#~ msgstr "ugyldig rustning"
+
+#~ msgid "no such user id"
+#~ msgstr "ikke-eksisterende bruger id"
+
+#~ msgid "secret key not available"
+#~ msgstr "hemmelig n�gle ikke tilg�ngelig"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "forkert hemmelig n�gle brugt"
+
+#~ msgid "not supported"
+#~ msgstr "ikke underst�ttet"
+
+#~ msgid "bad key"
+#~ msgstr "d�rlig n�gle"
+
+#~ msgid "file read error"
+#~ msgstr "fill�sningsfejl"
+
+#~ msgid "file write error"
+#~ msgstr "filskrivningsfejl"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "ukendt kompressionsalgoritme"
+
+#~ msgid "file open error"
+#~ msgstr "fil�bningsfejl"
+
+#~ msgid "file create error"
+#~ msgstr "filoprettelsesfejl"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "ugyldig kodes�tning"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "uimplementeret offentlig n�glealgoritme"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "uimplementeret cifferalgoritme"
+
+#~ msgid "unknown signature class"
+#~ msgstr "ukendt signaturklasse"
+
+#~ msgid "trust database error"
+#~ msgstr "tillidsdatabasefejl"
+
+#~ msgid "resource limit"
+#~ msgstr "resursegr�nse"
+
+#~ msgid "invalid keyring"
+#~ msgstr "ugyldig n�glering"
+
+#~ msgid "malformed user id"
+#~ msgstr "d�rlig bruger-id"
+
+#~ msgid "file close error"
+#~ msgstr "fillukningsfejl"
+
+#~ msgid "file rename error"
+#~ msgstr "filomd�bningsfejl"
+
+#~ msgid "file delete error"
+#~ msgstr "filsletningsfejl"
+
+#~ msgid "unexpected data"
+#~ msgstr "uforventet data"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "tidsstempelkonflikt"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "uanvendelig offentlig n�glealgoritme"
+
+#~ msgid "file exists"
+#~ msgstr "fil eksisterer"
+
+#~ msgid "weak key"
+#~ msgstr "svag n�gle"
+
+#~ msgid "invalid argument"
+#~ msgstr "ugyldigt argument"
+
+#~ msgid "bad URI"
+#~ msgstr "ugyldig URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "ikke-underst�ttet URI"
+
+#~ msgid "network error"
+#~ msgstr "netv�rksfejl"
+
+#~ msgid "not encrypted"
+#~ msgstr "ikke krypteret"
+
+#~ msgid "not processed"
+#~ msgstr "ikke bearbejdet"
+
+#, fuzzy
+#~ msgid "unusable public key"
+#~ msgstr "d�rlig offentlig n�gle"
+
+#, fuzzy
+#~ msgid "unusable secret key"
+#~ msgstr "d�rlig hemmelig n�gle"
+
+#, fuzzy
+#~ msgid "keyserver error"
+#~ msgstr "generel fejl"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "ikke krypteret"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "krypt�r data"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... dette er en fejl (%s:%d:%s)\n"
+
+#, fuzzy
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "operation er ikke mulig uden beskyttet hukommelse indl�st\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6218,10 +7807,6 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ msgstr "Ingen bruger-ID for n�gle\n"
 
 #, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "fejl ved oprettelse af kodes�tning: %s\n"
-
-#, fuzzy
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "ukendt cifferalgoritme "
 
@@ -6413,18 +7998,6 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
 #, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "skriver til `%s'\n"
-
-#, fuzzy
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "%s: bruger ikke fundet: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "kan ikke oprette %s: %s\n"
-
-#, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "kan ikke �bne %s: %s\n"
 
@@ -6470,9 +8043,6 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: ADVARSEL: tom fil\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "kan ikke �bne %s: %s\n"
-
 #~ msgid "Really sign? "
 #~ msgstr "Vil du gerne signere? "
 
@@ -6484,18 +8054,11 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ msgid "%s: can't make lock\n"
 #~ msgstr "%s: kan ikke �bne: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: kan ikke oprette mappe: %s\n"
-
 #, fuzzy
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "kan ikke �bne %s: %s\n"
 
 #, fuzzy
-#~ msgid "can't open file: %s\n"
-#~ msgstr "kan ikke �bne %s: %s\n"
-
-#, fuzzy
 #~ msgid "error: no ownertrust value\n"
 #~ msgstr "eksport�r ejertillidsv�rdierne"
 
@@ -6522,9 +8085,6 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "tilf�j n�gle"
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "kan ikke oprette %s: %s\n"
-
 #~ msgid "store only"
 #~ msgstr "gem kun"
 
@@ -6551,18 +8111,6 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ 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"
@@ -6575,44 +8123,14 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ 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"
-
 #, 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"
 
@@ -6632,15 +8150,6 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ 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"
 
@@ -6656,10 +8165,6 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\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"
 
@@ -6739,27 +8244,12 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ msgid "%s: error checking key: %s\n"
 #~ msgstr "%s: fejl ved unders�gelse af n�gle: %s\n"
 
-#~ msgid "Good certificate"
-#~ msgstr "Godt certifikat"
-
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "certifikatl�seproblem: %s\n"
-
 #~ msgid "can't lock keyring `%s': %s\n"
 #~ msgstr "kan ikke l�se n�glering `%s': %s\n"
 
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: bruger ikke fundet\n"
-
 #~ msgid "No key for user ID\n"
 #~ msgstr "Ingen n�gle for bruger-ID\n"
 
-#~ msgid "set debugging flags"
-#~ msgstr "s�t aflusningsflag"
-
-#~ msgid "enable full debugging"
-#~ msgstr "sl� fuld fejltjekning til"
-
 #~ msgid "do not write comment packets"
 #~ msgstr "skriv ikke kommentarpakker"
 
diff --git a/po/de.po b/po/de.po
index 349c8c1b6..d40e66a23 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-1.4.1\n"
+"Project-Id-Version: gnupg-1.9.90\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-09-25 08:38+0200\n"
-"PO-Revision-Date: 2006-09-25 08:56+0200\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
+"PO-Revision-Date: 2006-09-25 09:09+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgstr "Mantra"
 #: agent/command-ssh.c:533
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
-msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt"
+msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
 #: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
 #: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
@@ -97,7 +97,7 @@ msgstr "Fehler beim Holen der Seriennummer: %s\n"
 #: agent/command-ssh.c:1623
 #, c-format
 msgid "detected card with S/N: %s\n"
-msgstr "Erkannte Karte hat die Seriennummer: %s"
+msgstr "Erkannte Karte hat die Seriennummer: %s\n"
 
 #: agent/command-ssh.c:1628
 #, fuzzy, c-format
@@ -141,11 +141,6 @@ msgstr ""
 msgid "failed to create stream from socket: %s\n"
 msgstr "Fehler beim Speichern des Schlüssels: %s\n"
 
-#: agent/command-ssh.c:2867
-#, c-format
-msgid "failed to disable buffering on socket stream: %s\n"
-msgstr ""
-
 #: agent/divert-scd.c:217
 msgid "Admin PIN"
 msgstr "Admin PIN"
@@ -525,7 +520,8 @@ msgstr "Ungültiger Landescode in `%s', Zeile %d\n"
 #: agent/trustlist.c:158
 #, c-format
 msgid "system trustlist `%s' not available\n"
-msgstr "Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden"
+msgstr ""
+"Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden\n"
 
 #: agent/trustlist.c:193
 #, fuzzy, c-format
diff --git a/po/el.po b/po/el.po
index 096a52d1e..a6f26bf73 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -14,298 +14,723 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: agent/call-pinentry.c:193
 #, fuzzy, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
-msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "��� ����������� ������� �������� ���������\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "� ������ ����� ���� ������\n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "�������� ��������� ��� `%s'\n"
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "� ����� ������ ����� ���� ������\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "�� ������� ���������� ��� �����\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "���� MPI"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "���� ����� ������"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "���� ����� ������"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "������� ��� �������� �������� ��� `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "��� ������������� � ���������� ���������� %d%s\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:458
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
+
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "�������� �������� �������� ����������� `%s': %s\n"
+
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "�� ������� ��������� ������� ����������: %s\n"
+
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "�������� block �������� �������: %s\n"
+
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "�������� �������� ��� ����������� `%s': %s\n"
+
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' ��� ����� �������� ������ - ���������\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "��������: �� ������ random_seed ����� �����\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: �������� ����������� hashtable: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
+#: agent/divert-scd.c:217
+msgid "Admin PIN"
 msgstr ""
-"�������������: �� ������ ������� ������� random_seed - ���\n"
-"��������������\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "�������� ��������� ��� `%s': %s\n"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "����������� �� ����� ������: "
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: agent/divert-scd.c:290
 #, c-format
-msgid "can't create `%s': %s\n"
-msgstr "�������� ����������� ��� `%s': %s\n"
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr ""
 
-#: cipher/random.c:556 cipher/random.c:566
-#, c-format
-msgid "can't write `%s': %s\n"
-msgstr "�������� �������� ��� `%s': %s\n"
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
+"\n"
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "�������� ����������� ��� `%s': %s\n"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "������ ��� ������ ������"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "�������������: ����� �� �������� ���������� ������� �������!!\n"
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "������ ��� ������ ������"
 
-#: cipher/random.c:815
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"� ��������� ������� ������� ����� ���� ������� ��� ���� �� �����\n"
-"\n"
-"�� ��������������� �������� ��� ����� �������� ��� ���� �� ���������!!\n"
-"\n"
+"@\n"
+"��������:\n"
+" "
 
-#: cipher/rndegd.c:202
-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"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
 msgstr ""
-"������ ����������, � �������� ��������������. ����� ��� ���� �������\n"
-"��� �� ��� ���������, ����� ���� �� ��������� ��� �������� ��� ��������.\n"
 
-#: cipher/rndlinux.c:132
-#, 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"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
 msgstr ""
-"\n"
-"��� �������� ������ ��������� ������ bytes.  ����������� �� ���������� �\n"
-"�� ����������� �� ����������� ������� ����� ���� �� ������������\n"
-"����������� ��������! (����������� %d ����������� bytes)\n"
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "�������� ������������� ��� TrustDB: %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "���������"
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "�������� ������������ ��� cache �����������: %s\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "����� ������"
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "�������� block �������� �������: %s\n"
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|������|������� ��� ���������� ��������� ������"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "��������� �������� �� ��� ���������� ��������"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr ""
+"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "�������� ��� ����� ��������� ������������"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "��������� �� ���������� ��� <[email protected]>\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "keyserver �������� �������: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "��������: �� �������������� ������ �������� `%s'\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "������ �������� `%s': %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "�������� �������� ��� `%s'\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "������ ���� �� ���������� ��� `%s': %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "�������� ����������� ��������� `%s': %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "�������� ����������� ��� %s: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "������ ��� �������� ���� �� `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "� ��������� �������: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "������� ��� �������� �������� ��� `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: ��������� �������������\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "trustdb: read ������� (n=%d): %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: �������� ����������� ���������: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "� ��������� �������� �������: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: ������������: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' ��� �����������\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "���������� ���� ���� ������� ��������"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "���� ����� ������"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "�������"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "�� ������ '%s' �� �������: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "������� ��� �������� �������� ��� ����� ���������\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "������ ���������: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "�������� ������������� ��� TrustDB: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "�������� block �������� �������: %s\n"
+msgid "Yes"
+msgstr "���|���"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "� ���������� �������� �������: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "�������� ��������� ��� �������: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s ��������, ���������� ��������� %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "������ ���� �� ���������� ��� `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[User id ��� �������]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "�������� �������� ��� `%s': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "�������� ������������ �� �� gpg-agent\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "��������� ��� �� ������\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "�������� ��������������� ��� core dump: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "���|���"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "���|���"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "�����������"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "�� �������� ������ OpenPGP ��������.\n"
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: g10/armor.c:320
 #, c-format
@@ -384,176 +809,213 @@ msgstr ""
 "�����������, �� ����������, ���������� ��� �������� - ���� ����� ����� "
 "������������� MTA\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
+"��� �� ����� �� ��� '='\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "�������������: �������� �� ������ �������� ���������\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "�� ����������"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�� ������� ������ ��� ����� ���������"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "��� ���� ������� �����"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "�� �������������"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -561,207 +1023,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "�� ������� ������ ��� ����� ���������"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "�������� block �������� �������: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr ""
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr ""
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "����������� �� ����� ������: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output ��� ���������� ��� ���� ��� ������\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -805,49 +1215,49 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "�������� ������ ���� ����������� ������� ESK ���� ��� ���������� S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "����� ��� ���������������: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�������� ��� `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "�������� ������ ��� ��������������� IDEA ��� ��� �� ������� �� �� "
 "�������������������.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -855,7 +1265,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -864,105 +1274,100 @@ msgstr ""
 "� ������������ ������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "�������������: �� ������ ��������������� �� ������� ������ ���\n"
 "���������� ��������������.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "�������� ��� �������� ���������������� �������\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "��� ������������ � ������������� �������� ������������\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "�������� ����������� ��������� `%s': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "�� ������� ���������� ������������ ����������������� ���� ��������� ������\n"
 "�������\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "���� � ��������� ������� ������. ������ ���� ����� ���������� ������������\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "������ ���������� ���� ��� ����� ���������� ������������: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "������� ������ ��� ���������� ������������\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "�������� ��������� ��� ���������� ������������\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "�������� ��������� ��� ��������� ��� ���������� ������������: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
@@ -970,69 +1375,109 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "�� ��������������� ������� ������"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[User id ��� �������]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, 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:2381 g10/keyedit.c:3708
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
+
+#: g10/getkey.c:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
+
+#: g10/getkey.c:2659
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1040,128 +1485,129 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1171,51 +1617,47 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "���������"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1223,7 +1665,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1243,15 +1685,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1261,7 +1703,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1269,650 +1711,590 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "��������: �� �������������� ������ �������� `%s'\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "������ �������� `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "�������� �������� ��� `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/gpg.c:2986
+#: g10/gpg.c:3010
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:3012
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[User id ��� �������]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, 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:2380 g10/keyedit.c:3707
-#, fuzzy, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
-
-#: g10/getkey.c:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
-
-#: g10/getkey.c:2658
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "����� ������"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "������� ��� �������� ��� ���� �� ����������"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1920,7 +2302,7 @@ msgstr ""
 "�������: gpg [��������] [������]\n"
 "������� ��������� �� �������� �� ������ ������������ �������\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1931,7 +2313,7 @@ msgstr ""
 "������������,\n"
 "��� ���� ������ �� ����� �� ��� (������� �������������) ����-��������������."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1945,19 +2327,19 @@ msgstr ""
 "������\n"
 "���� ����� �����������\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "��� ������ �� ��������������� ���� �� �� ������������ ������, ��������� \"yes"
 "\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:68
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "�������������� �� user ID ��� �������� ����� ��� ������ �� �������� ������."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1971,7 +2353,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1981,16 +2363,16 @@ msgstr ""
 "��� �������������. ����� � ���������� ������ �� ��������������� ���� ��\n"
 "���������� ������. � �������� ���� ������� �� ������ ��������� ����������."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "�������������� �� ������� ��� ��������"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "��������� \"yes\"(���) � \"no\"(���)"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -2002,19 +2384,19 @@ msgstr ""
 "��� �� ������ ��� ���� �������� ��������� - �������� �� �������\n"
 "��������� �� ���������� ��� ���� ��� ��������."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "�������������� �� ����� ��� �������������"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "�������������� ����������� ��� ��������� email (����������)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "�������� ����������� �������������� ��� ������"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2028,13 +2410,13 @@ msgstr ""
 "O  ��� �������� ��� ����������� ��������.\n"
 "Q  ��� �� ����������� �� ���������� ��������."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "��������� \"yes\" (� ���� \"y\") ��� ����� ������� �� ������������ �� "
 "���������."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:150
 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"
@@ -2106,12 +2488,12 @@ msgstr ""
 "\n"
 "��� ��� ������ ���� ����� � ����� ��������, ����� \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "��������� \"yes\" ��� ������ �� ���������� ��� �� user ID"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2119,11 +2501,11 @@ msgstr ""
 "��������� \"yes\" ��� ���������� ������ �� ��������� ����\n"
 "�� user ID.  ��� �� ������������� �� ������ ����!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "��������� \"yes\" ��� ����� ������� �� ��������� �� ���������"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2134,7 +2516,7 @@ msgstr ""
 "��������� ��� �������� ������������ ��� ������ � �� ��� ���� ������\n"
 "������������� ��� ����."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2146,7 +2528,7 @@ msgstr ""
 "��������������� ����� ���� �� ������ ��������� ������ �� ����������\n"
 "��� ������� ������������ ���� ���� ����� ��� �������������� ��������."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2154,7 +2536,7 @@ msgstr ""
 "� �������� ��� ����� ������.  ����� ������ �� ��������� ��� ��\n"
 "���������� ���."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2168,7 +2550,7 @@ msgstr ""
 "�� ������ ���.  ����� �� ���������� ���� ��� ���� � ����-�������� ���\n"
 "������ ���� ��� ����� ������ � ������� ��� �������."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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"
@@ -2178,23 +2560,23 @@ msgstr ""
 "���� ������������ ����� �����������.  � ���������� ���� ��� ������������\n"
 "����-��������� �� ������� ���� 1 ������������.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "�������� ����������� �� ��������� ����� ������, ��� ��������."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "����� �� ����� ��� ������� ��� ����� ����������� � ��������"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��������� \"yes\" ��� ����� ������� �� ����������� �� ������"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2202,7 +2584,7 @@ msgstr ""
 "�������� �������� ��� ��� ����� �������. ��� ���� �������� RETURN\n"
 "�� ��'������� ������ (������������� ���� �������) �� ��������������."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2230,7 +2612,7 @@ msgstr ""
 "      ��������������� ���� ��� �� �������� ��� �� user ID ��� ������\n"
 "      �� ��������������� ���. ��� �� ������� ����� ��� ��������� email.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2241,11 +2623,11 @@ msgstr ""
 "�������� �������� ���� �� ������� ���������. ��� ����� ������\n"
 "����� �� �������.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "��� ������� ��������� �������"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "��� ������� ��������� ������� ��� `%s'"
@@ -2281,501 +2663,496 @@ msgstr "�� ��������������� ������� ������"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��������� �������� ��� ����� %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ������� ����� ����� ���� ������������\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ��� ������� ��� �������������: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ����� user ID: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              ����������: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             ����������: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          ��� user ID: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ��� ����������: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   ���� ���������� ��������: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ���������� ������� �������: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " ���������� ������� �������: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ��  ����������: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "����� ��������� ���� �� user ID:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "���������� `%s' �������������\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[��������]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[����-��������]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 ���� ��������\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ����� ���������\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ��������� ��� ���������� ���� ���������\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID ����������� ����� ������ ����-��������\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2788,63 +3165,63 @@ msgstr ""
 "�� �������� passports ��� fingerprints ��� �������� �����...);\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = ��� ������ �����������\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = ��� ����� �����������\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�� user ID \"%s\" ���� �����."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2853,11 +3230,11 @@ msgstr ""
 "� ����-�������� ��� \"%s\"\n"
 "����� ��� �������� ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2866,12 +3243,12 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "���� �����.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2880,43 +3257,43 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "����� ��� ������ ��������.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "������� ������ ����� �� �� ��������������; (y/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "���� �� ������ ���� �����!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2924,11 +3301,11 @@ msgstr ""
 "�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
 "��������� --pgp2.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2938,32 +3315,32 @@ msgstr ""
 "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
 "�������\"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) ��� ������.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��� ��� ������� �������.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "� ������� ���; (�������������� ? ��� �����������): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2972,21 +3349,21 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -2994,14 +3371,14 @@ msgstr ""
 "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "� �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -3009,65 +3386,65 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "��� ��� ������� ������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "��� ����� ����������� ������ �� ���� �� ������.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "��� ������� ���� ���������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3075,219 +3452,219 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3295,242 +3672,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "������� ����� ���������"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3538,19 +3915,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3558,7 +3935,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3567,55 +3944,55 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3625,38 +4002,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3664,341 +4041,346 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "�������� ���������: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "� ���������� %c%lu ������������\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "������� ������ ���������\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "������� ����-���������\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "������������� ���������"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4014,7 +4396,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4030,40 +4412,40 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4071,12 +4453,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4093,44 +4475,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4141,7 +4523,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
@@ -4156,23 +4538,23 @@ msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1997
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4180,12 +4562,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4197,7 +4579,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4209,50 +4591,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4263,12 +4645,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4276,7 +4658,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4284,33 +4666,33 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "����     "
 
@@ -4338,632 +4720,605 @@ msgstr "�������� ���������: "
 msgid "Keyring"
 msgstr "����������"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "     ��������� �����������:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     ��������� �������� ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�������������: 2 ������ �� ������������� ����������� ��������.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ����� �� ����������\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ����� �� ���\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "�������� ��������� ���� ��� ������ \"�����\" ���������\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "������� ����������� `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������������\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s ������ ���������������� ��������\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "������� ������ ����� %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "��������������� �� %s key, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������� �� ������� ������ �������: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "��������������� �� %lu ������� �������\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "��������������� �� 1 ����� ������\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "������� %s ���������������� ���������\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
 "%s ��������\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "���������������� OK\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "�������� ��������������� ��� core dump: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�� ������������ ���������� ��������������"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = ���������� ������������ �����������\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "����������"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "�� ������ `%s' ������� ���. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ������� ��������\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "�������������� ��� ��� ����� �������"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "������� ���� stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "������� �������������� ��������� ��� `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "������������� ��� ������ �������� `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/openfile.c:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: ��������� �������������\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "�������� �������� ��� `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�������� �� ��� agent - �������������� ��� ������ ��� agent\n"
@@ -5030,7 +5385,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "����������� �� ����� ������: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5044,39 +5399,35 @@ msgstr ""
 "�������������� ��� ������ ������ �� ������ ��� ���������� �� ����� ������!\n"
 "������� ������� ��� ��� ������ ����� ���� ����� ��� 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "�������������� ��� ����� ������� ��� �� photo ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" ��� ����� JPEG ������\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "����� ���� � ���������� ����� (y/N/q); "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "�������� ����������� ��� photo ID!\n"
 
@@ -5364,61 +5715,56 @@ msgstr "������ ������ ���������\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "������ ���� �� ���������� ��� `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "���������� ��������.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "�������� �� ����� ������� ���������: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "�������� ��� stdin ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "��� �������� ������������� ��������\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "�������� ���������� ������ �������� �������� %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "�������, ������� � �������� ����������.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "������ ������������ ��� DEK ��� �������������\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "� ���������� �������������� %d%s ����� �������� � �����������������\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "��������: � ���������� �������������� %d ��� ����� ���� ��������\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
@@ -5541,95 +5887,95 @@ msgstr "(��� ������ ���������)\n"
 msgid "Is this okay? (y/N) "
 msgstr "����� ���� �������; "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "�� ������ ����� ������, ��������� ����"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�������������: ����������� ������� ������ - ������� �� ����� ������\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "���������� ��� �� ������������� 16-bit checksum ��� �� ��������� ���\n"
 "�������� ��������\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "������������� ������� ������ - ��������� �����������\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "�������� �������� �������� �������� ��� ���������� ��������������, ������ "
 "��� %d �����!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "�������������: ��������� ��������� ��������� ��� ������\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ���� ����� ���' ������������� "
 "�����������\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5637,7 +5983,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5645,54 +5991,54 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "��������: �� ������ ��������� %08lX ����� ���� %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "������� ����� ��������� ��� ������ %08lX ���� �������� �������� bit\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "�������� ����������� ��������� �������� �� ��������� v3 (PGP 2.x ����)\n"
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "�������� ����������� ��������� �������� �� ��������� �������� v3 (PGP 2.x "
 "����)\n"
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "�������������: �������� ���� %%-�������� ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5700,7 +6046,7 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5719,13 +6065,13 @@ msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5733,41 +6079,41 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�� ������ ��� ���� ��������� ��� ��������� - ��� ������ �� �������������� �� "
 "������� RNG!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "������������ `%s': ������������\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "������������ `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5827,51 +6173,51 @@ msgstr "������ ���������: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync �������: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: �������� lseek: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "���� ������ ��������� trustdb\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: � ������� ��� �������!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �������� ����������� ���� �������� �������: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ������������� �� ������ trustdb\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ������������� � trustdb\n"
@@ -5880,78 +6226,78 @@ msgstr "%s: ������������� � trustdb\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "��������: � trustdb ��� ����� ���������\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �� ������ trustdb\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �������� ����������� hashtable: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ������ ���� ��������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: ������� lseek: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ��� ����� trustdb ������\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: ������� ������� �� recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �� ������ ������ ������� %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
 
@@ -5960,7 +6306,7 @@ msgstr "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "�������� ��������� ������� �������� ����������� ��� %d ����������\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "������ ������� ���������� ��� %d ����������\n"
@@ -6131,7 +6477,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6141,345 +6487,1604 @@ msgstr ""
 "�������� ��� ������� ��� �� ������ ��������� (.sig or .asc)\n"
 "������ �� ����� �� ����� ������ ��� ������ �������.\n"
 
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "������ ������� %u ����� ���� ������ � ��� ������ �� LF\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "������ ������"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "������� ��� bug ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "�������� ����� �������"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "������� ������"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "�������� ��������� ��� �������: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "�������� ���������� �������� ��������"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "�������� �������: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "�������� ���������� ���������"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "���� ������� ������"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "���� ������� ������"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "���� ��������"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "������ checksum"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "���� ����� ������"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "��� ������� �� ������� ������"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "�������� ���������� ��������������"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "�������� ��������� ��� ����������"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "�� ������ ������"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "�������� block �������� �������: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "�� ������ ��������"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "������� ��������� ������ (user id)"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "�� ������� ������ ��� ����� ���������"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "����� ����� �������� ��������"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "��� �������������"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "���� ������"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "keyserver �������� �������: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "������ ��������� �������"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "������ �������� �������"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "�������� ���������� ���������"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "������ ��������� �������"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "������ ����������� �������"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "�� ������ ����� ������"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "�� ������������ ���������� �������� ��������"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "�� ������������ ���������� ��������������"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "������� ����� ���������"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "������ ��� ����� ��������� ������������"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "���� MPI"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' ��� �����������\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "���� �����"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "�� ������ ����������"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "���������� ���� ���� ������� ��������"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "���� �������������"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "��������������� ��������� ������ (user id)"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "������ ����������� �������"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "������ ������������ �������"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "������ ��������� �������"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "�� ����������� ��������"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "��������� ���� (timestamp)"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "�������� block �������� �������: %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "�� ���������������� ���������� �������� ��������"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "� ���������� �������� �������: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "�� ������ �������"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "������� ������"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "�� ������ ������"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "���� URI"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "�� �������������� URI"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "������ �������"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "�� ���������������"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "�� �������������"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "�������� �������� ��� `%s'\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "�� ��������������� ������� ������"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "�� ��������������� ������� ������"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "������ ���������� ��������"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "�������"
+msgid "do not use the internal CCID driver"
+msgstr "�� ����� ����������"
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "�� ���������������"
+msgid "allow the use of admin card commands"
+msgstr "������������� �������\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "��� �������� ������������� ��������\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... ���� ����� bug (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "������� ��� bug ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "���|���"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "�� ������� radix64 ���������� %02x ���������\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "yY"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "�������� ��������� ��� `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "������� ��� �������� �������� ��� `%s'\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "�������� ������������� ��� TrustDB: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "��������: �� ������ ���� ���������"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "���� �������������"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "������ ��������� ���: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "���������� ���� �������������� ���������"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "���� �� ������ ���� �����!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "���������� ��� fingerprint"
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "���������� ���� ���������"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "���|���"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "�������"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "������: �� ������ ���������\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "������: �� ������ ���������\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"���������� ��� ����� ������ ��� �� ������������ �� ������� ������ ��� �� "
+"������:\n"
+"\"%.*s\"\n"
+"%u-bit %s ������, ID %08lX, ���������� %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "�������� �������� �������� ����������� `%s': %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "�� ������� ����������  hash `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "�� ������ ��������� Email\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "� ���������� �������� �������: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "�� ������ '%s' �� �������: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "������������� ��������� �������������.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "� ���������� %c%lu ������������\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "�������� block �������� �������: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(��� ������ ���������)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "������� ���  `%s'\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[������]|���������� ���� ���������"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[������]|���������� ���� �� ���������������� ���������"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "���������� ��� ������ �������� ��������"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "���� �������������"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "�������� ��� �������� ��� �� ������� ����������"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "���� �������������"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "���� �������������"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "������ ��� ������ ������"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "���������� ascii ������������ ������"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|�����|����� ��� �������� �� ��������������� ���������"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "�� ����� ����������"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "������������ ������ v3 ���������"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "����� ������� MDC ��� �������������"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "��������� batch: �� �� �������� ���������"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "�������� ��� ���� ������������ ���������"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "�������� ��� ���� ������������ ���������"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "�������� ����� ��� �������� ����������� ��� �����"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|�����|����� �������� ��� �������������� ������� ������"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|������|������� ��� ���������� ��������� ������"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|�����|����� ���������� �������������� �����"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|�����|����� ���������� ��������� ��������� ����� "
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|����� ���������� ��������� N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"�������: gpg [��������] [������]\n"
+"��������, �������, ������������� � ����������������\n"
+"� �������������� ���������� ��������� ��� �� �������� �������\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "�����: gpg [��������] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "�������� �������� ��� `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "������� ���  `%s'\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "�������� ����������� ��� `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "��������� ������� ��� ��������������: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "���������� ���� �������������� ���������"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "���������� `%s' �������������\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "�������� ������������� ��� TrustDB: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "�������� ������������� ��� TrustDB: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? �������� ���� ������ ���������: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "������: �� ������ ���������\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "�������� ����� ���� %s.\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "���� �������� ��� \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                ������ ��� \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "�����������"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "qQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "� ������ ����� ���� ������\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "�������� ��������������� ���������� `%s'\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "� �������� �������: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "�������� block �������� �������: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "������ ��� �������� ���� �� `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "������ ��� �������� ���� �� `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "�����: gpg [��������] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "��� ������� �� ������� ������"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@�������:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "���������������� OK\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "���������������� OK\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [����� �������]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "�� %s ��� ����������� �� �� %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "�������� ��������� ��� �������: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "�������� ����������� ��������� `%s': %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "�������� ��������� ��� %s: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "�������� �������� ��� ����������� `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "��� ������������ � ������������� �������� ������������\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "�������� ����������� ��� %s: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "�������� ����������� ��� %s: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "� ��������� �������: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "�������� block �������� �������: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "� ��������� �������: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "� ��������� �������: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "� ��������� �������: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "�������� ����������� ��� `%s': %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "�������� ����������� ��� `%s': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "��� ������������� � ���������� ���������� %d%s\n"
+
+#, fuzzy
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "��� ����������� ������� �������� ���������\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "�������� ��������� ��� `%s'\n"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "�������������: ����� �� �������� ������!\n"
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "������� ��� �������� �������� ��� `%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' ��� ����� �������� ������ - ���������\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "��������: �� ������ random_seed ����� �����\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr ""
+#~ "�������������: �� ������ ������� ������� random_seed - ���\n"
+#~ "��������������\n"
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "����� �� http://www.gnupg.org/faq.html ��� ������������ �����������\n"
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "�������� �������� ��� `%s': %s\n"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "�������� ����������� ��� `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "�������������: ����� �� �������� ���������� ������� �������!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "����� �� http://www.gnupg.org/why-not-idea.html ��� ������������ "
-#~ "�����������\n"
+#~ "� ��������� ������� ������� ����� ���� ������� ��� ���� �� �����\n"
+#~ "\n"
+#~ "�� ��������������� �������� ��� ����� �������� ��� ���� �� ���������!!\n"
+#~ "\n"
+
+#~ 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"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "\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"
+#~ "��� �������� ������ ��������� ������ bytes.  ����������� �� ���������� �\n"
+#~ "�� ����������� �� ����������� ������� ����� ���� �� ������������\n"
+#~ "����������� ��������! (����������� %d ����������� bytes)\n"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "�� ������� ������ ��� ����� ���������"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "����� ��������� ���� �� user ID:\n"
+
+#~ msgid "general error"
+#~ msgstr "������ ������"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
+#~ msgid "unknown packet type"
+#~ msgstr "�������� ����� �������"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "�������������: �������� �� ������ �������� ���������\n"
+#~ msgid "unknown version"
+#~ msgstr "������� ������"
 
-#~ msgid "not human readable"
-#~ msgstr "�� ����������"
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "�������� ���������� �������� ��������"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "�������� ���������� ���������"
+
+#~ msgid "bad public key"
+#~ msgstr "���� ������� ������"
+
+#~ msgid "bad secret key"
+#~ msgstr "���� ������� ������"
+
+#~ msgid "bad signature"
+#~ msgstr "���� ��������"
+
+#~ msgid "checksum error"
+#~ msgstr "������ checksum"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "�������� ���������� ��������������"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "�������� ��������� ��� ����������"
+
+#~ msgid "invalid packet"
+#~ msgstr "�� ������ ������"
+
+#~ msgid "invalid armor"
+#~ msgstr "�� ������ ��������"
+
+#~ msgid "no such user id"
+#~ msgstr "������� ��������� ������ (user id)"
+
+#~ msgid "secret key not available"
+#~ msgstr "�� ������� ������ ��� ����� ���������"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "����� ����� �������� ��������"
+
+#~ msgid "not supported"
+#~ msgstr "��� �������������"
+
+#~ msgid "bad key"
+#~ msgstr "���� ������"
+
+#~ msgid "file read error"
+#~ msgstr "������ ��������� �������"
+
+#~ msgid "file write error"
+#~ msgstr "������ �������� �������"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "�������� ���������� ���������"
+
+#~ msgid "file open error"
+#~ msgstr "������ ��������� �������"
+
+#~ msgid "file create error"
+#~ msgstr "������ ����������� �������"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "�� ������ ����� ������"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "�� ������������ ���������� �������� ��������"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "�� ������������ ���������� ��������������"
+
+#~ msgid "unknown signature class"
+#~ msgstr "������� ����� ���������"
+
+#~ msgid "trust database error"
+#~ msgstr "������ ��� ����� ��������� ������������"
+
+#~ msgid "resource limit"
+#~ msgstr "���� �����"
+
+#~ msgid "invalid keyring"
+#~ msgstr "�� ������ ����������"
+
+#~ msgid "malformed user id"
+#~ msgstr "��������������� ��������� ������ (user id)"
+
+#~ msgid "file close error"
+#~ msgstr "������ ����������� �������"
+
+#~ msgid "file rename error"
+#~ msgstr "������ ������������ �������"
+
+#~ msgid "file delete error"
+#~ msgstr "������ ��������� �������"
+
+#~ msgid "unexpected data"
+#~ msgstr "�� ����������� ��������"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "��������� ���� (timestamp)"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "�� ���������������� ���������� �������� ��������"
+
+#~ msgid "file exists"
+#~ msgstr "�� ������ �������"
+
+#~ msgid "weak key"
+#~ msgstr "������� ������"
+
+#~ msgid "invalid argument"
+#~ msgstr "�� ������ ������"
+
+#~ msgid "bad URI"
+#~ msgstr "���� URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "�� �������������� URI"
+
+#~ msgid "network error"
+#~ msgstr "������ �������"
+
+#~ msgid "not encrypted"
+#~ msgstr "�� ���������������"
+
+#~ msgid "not processed"
+#~ msgstr "�� �������������"
+
+#~ msgid "unusable public key"
+#~ msgstr "�� ��������������� ������� ������"
+
+#~ msgid "unusable secret key"
+#~ msgstr "�� ��������������� ������� ������"
+
+#~ msgid "keyserver error"
+#~ msgstr "������ ���������� ��������"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "�� ���������������"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "��� �������� ������������� ��������\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... ���� ����� bug (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "�������������: ����� �� �������� ������!\n"
+
+#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#~ msgstr ""
+#~ "����� �� http://www.gnupg.org/faq.html ��� ������������ �����������\n"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
+
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6518,10 +8123,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "������ ��� ���������� ��� ������ ������: %s\n"
-
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "���� ����� ������ �������� ���������� �������������� (%d)\n"
 
@@ -6534,18 +8135,9 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "�������� �������� ��� FD ��� �� ���������� ��� ��� agent\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "�������� ������������ �� �� gpg-agent\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "� ����� ������ ����� ���� ������\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "�� ������ �������� ��� ��� agent\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "������� ������������� �������� N"
 
@@ -6798,20 +8390,9 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ "� ����� ����� ��� ���������� �������������� ��� ����������. "
 #~ "�������������� ��� ��� �����������!\n"
 
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "������� ���  `%s'\n"
-
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "�������, ��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "�� ������ '%s' �� �������: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "�������� ����������� ��� `%s': %s\n"
-
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "�������� ��������� ��� �������: %s\n"
@@ -6857,9 +8438,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: �������������: ����� ������\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "�������� ��������� ��� %s: %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
 #~ msgstr " %d = ��� ������ �����������\n"
@@ -6896,9 +8474,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: �������� �����������: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: �������� ����������� ���������: %s\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr ""
 #~ "��� ������ �� ��������������� ���� �� ��������� ������, ��������� \"yes\"."
@@ -6906,9 +8481,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "�������� ��������� ��� ����������� \"%s\": %s\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "�������� ��������� ��� �������: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "������: ������ � ��� ��� ���� ������\n"
 
@@ -6924,9 +8496,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- ������� ������������ ��������\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? �������� ���� ������ ���������: %s\n"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [�����: %s]"
@@ -6938,9 +8507,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "[����������]"
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "�������� ����������� ��� %s: %s\n"
-
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
@@ -6980,18 +8546,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ 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 ���������"
 
@@ -7001,48 +8555,18 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ 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 "|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 "|[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"
 
@@ -7065,15 +8589,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ 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 ��� ���������������� �������"
 
@@ -7125,9 +8640,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\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"
 
diff --git a/po/eo.po b/po/eo.po
index 6c98c3ee2..cd99448b3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -14,295 +14,724 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr ""
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
 msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
+
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "pasfrazo estas tro longa\n"
+
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "pasfrazo estas tro longa\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Nevalida signo en nomo\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
 msgstr ""
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "ne povas malfermi '%s'\n"
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "malbona MPI"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "malbona pasfrazo"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "malbona pasfrazo"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "skribas sekretan �losilon al '%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "ne povas krei '%s': %s\n"
+
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:458
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "ne povas stat-i '%s': %s\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
+
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
+
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
+
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
+
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "'%s' ne estas normala dosiero - ignorita\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "noto: dosiero random_seed estas malplena\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: cipher/random.c:474
+#: agent/divert-scd.c:217
 #, fuzzy
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
+msgid "Admin PIN"
+msgstr "Donu la uzantidentigilon: "
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "ne povas legi '%s': %s\n"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Ripetu pasfrazon: "
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "noto: dosiero random_seed ne aktualigita\n"
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: agent/divert-scd.c:290
 #, c-format
-msgid "can't create `%s': %s\n"
-msgstr "ne povas krei '%s': %s\n"
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr ""
 
-#: cipher/random.c:556 cipher/random.c:566
-#, c-format
-msgid "can't write `%s': %s\n"
-msgstr "ne povas skribi '%s': %s\n"
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
+"\n"
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "ne povas fermi '%s': %s\n"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "�an�i la pasfrazon"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "�an�i la pasfrazon"
 
-#: cipher/random.c:815
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"La kvaza�stokastilo estas nur simpla protezo, por ke la\n"
-"programo entute ruli�u; �i neniel estas forta stokastilo!\n"
-"\n"
-"NE UZU DATENOJN KREITAJN DE �I TIU PROGRAMO!!\n"
-"\n"
+"@\n"
+"Opcioj:\n"
+" "
 
-#: cipher/rndegd.c:202
-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"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
 msgstr ""
 
-#: cipher/rndlinux.c:132
-#, 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"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
 msgstr ""
-"\n"
-"Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
-"mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "detala eligo"
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "iom malpli da informoj"
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "ser�i �losilojn �e �losilservilo"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "aktualigi la fido-datenaron"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "Kreado de �losiloj malsukcesis: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "opcio-dosiero '%s': %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "legas opciojn el '%s'\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "eraro dum kreado de '%s': %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, fuzzy, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: ne povas krei dosierujon: %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "ne povas krei %s: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "eraro dum sendo al '%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "aktualigo malsukcesis: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "skribas sekretan �losilon al '%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: dosierujo kreita\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: ne povas krei dosierujon: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "\t%lu �losiloj ignoritaj\n"
+
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "eraro dum legado de �losilbloko: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: eraro dum legado de libera registro: %s\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "'%s' jam densigita\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "krei novan �losilparon"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "malbona pasfrazo"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "nuligita de uzanto\n"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "�losilo '%s' ne trovita: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "sekretaj �losilpartoj ne estas disponataj\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "kiraso: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+msgid "Yes"
+msgstr "jes"
 
-#: g10/app-openpgp.c:1904
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Kreado de �losiloj malsukcesis: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "ne povas malfermi %s: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s-subskribo de: %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "eraro dum kreado de '%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "%s: uzanto ne trovita\n"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "ne povas konekti�i al '%s': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "komunikproblemo kun gpg-agent\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "problemo kun agento: agento redonas 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "nuligita de uzanto\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "problemo kun agento: agento redonas 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+#, fuzzy
+msgid "yes"
+msgstr "jes"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "jJ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "ne"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "fini"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "fF"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "k"
 
 #: g10/armor.c:320
 #, c-format
@@ -381,176 +810,215 @@ msgstr ""
 "quoted-printable-signo en kiraso - ver�ajne cima po�totransendilo estis "
 "uzata\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+#, fuzzy
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
+"kaj fini per '='\n"
+
+#: g10/build-packet.c:956
+#, fuzzy
+msgid "a user notation name must contain the '@' character\n"
+msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "AVERTO: nevalida notacia dateno trovita\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "ne homlegebla"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "en"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "en"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenia kialo specifita"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -558,210 +1026,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "sekreta �losilo ne havebla"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-#, fuzzy
-msgid "Enter New Admin PIN: "
-msgstr "Donu la uzantidentigilon: "
-
-#: g10/cardglue.c:918
-#, fuzzy
-msgid "Enter New PIN: "
-msgstr "Donu la uzantidentigilon: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-#, fuzzy
-msgid "Enter PIN: "
-msgstr "Donu la uzantidentigilon: "
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Ripetu pasfrazon: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output ne funkcias por �i tiu komando\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -804,217 +1217,251 @@ msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 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/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, 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:812
+#: g10/encode.c:822
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTO: mesa�o estis �ifrita per malforta �losilo en la simetria �ifro.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "problemo �e traktado de �ifrita paketo\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, fuzzy, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "%s: ne povas krei dosierujon: %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, fuzzy, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "neuzebla sekreta �losilo"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, 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:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "tro da registroj en pk-staplo - mal�altas\n"
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[Uzantidentigilo ne trovita]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
+
+#: g10/getkey.c:2659
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1022,128 +1469,129 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1153,51 +1601,47 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "detala eligo"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1205,7 +1649,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1225,15 +1669,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1243,7 +1687,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1251,653 +1695,594 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "opcio-dosiero '%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "legas opciojn el '%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 #, 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/gpg.c:2988
+#: g10/gpg.c:3012
 #, 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, 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/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, 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/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "tro da registroj en pk-staplo - mal�altas\n"
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[Uzantidentigilo ne trovita]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, fuzzy, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
-
-#: g10/getkey.c:2658
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "iom malpli da informoj"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1907,7 +2292,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:55
+#: g10/helptext.c:57
 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"
@@ -1919,18 +2304,18 @@ msgstr ""
 "aliron al la sekreta �losilo. Respondu \"jes\" por igi �i tiun �losilon\n"
 "absolute fidata\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1944,23 +2329,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Donu la �losilgrandon"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Respondu per \"jes\" a� \"ne\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1972,19 +2357,19 @@ msgstr ""
 "bonan eraromesa�on; anstata�e la sistemo provas interpreti\n"
 "la donitan valoron kiel gamon."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Donu la nomon de la �losilposedanto"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "bonvolu doni retadreson (ne devige, sed tre rekomendate)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Bonvolu doni nedevigan komenton"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1998,11 +2383,11 @@ msgstr ""
 "B  por da�rigi kun la �losilkreado.\n"
 "F  por interrompi la �losilkreadon kaj fini."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2072,12 +2457,12 @@ msgstr ""
 "\n"
 "Se vi ne scias la �ustan respondon, respondu per \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Respondu per \"jes\", se vi volas subskribi �iujn uzantidentigilojn"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2085,11 +2470,11 @@ msgstr ""
 "Respondu per \"jes\", se vi vere volas forvi�i la uzantidentigilon.\n"
 "Tiam anka� �iuj atestiloj perdi�os!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 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:200
+#: g10/helptext.c:202
 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"
@@ -2099,7 +2484,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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2111,7 +2496,7 @@ msgstr ""
 "�losilo estis uzita, �ar la subskribanta �losilo eble establos\n"
 "fido-ligon tra alia jam atestita �losilo."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2119,7 +2504,7 @@ msgstr ""
 "La subskribo ne estas valida. Estas prudente forigi �in de\n"
 "via �losilaro."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2133,7 +2518,7 @@ msgstr ""
 "mem-subskribo estas ial nevalida, kaj dua mem-subskribo estas\n"
 "havebla."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 #, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
@@ -2144,24 +2529,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:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 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:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Respondu per \"jes\", se la dosiero estu surskribita"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2169,7 +2554,7 @@ msgstr ""
 "Bonvolu doni novan dosiernomon. Se vi premas nur ENEN, la implicita\n"
 "dosiero (montrita en parentezo) estos uzata."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2197,7 +2582,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:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2207,11 +2592,11 @@ msgstr ""
 "�i tiun revokatestilon. Bonvolu fari �i tiun tekston konciza.\n"
 "Malplena linio finas la tekston.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Nenia helpo disponata"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
@@ -2246,491 +2631,486 @@ msgstr "neuzebla sekreta �losilo"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 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:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, 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:1276
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, 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:1802
+#: g10/import.c:1801
 #, 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:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "�losilaro '%s' kreita\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2743,64 +3123,64 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 #, 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:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2811,7 +3191,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -2820,7 +3200,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2831,12 +3211,12 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 #, 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:755
+#: g10/keyedit.c:756
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2847,7 +3227,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2856,53 +3236,53 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 #, 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:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 #, 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:889
+#: g10/keyedit.c:890
 #, 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:891
+#: g10/keyedit.c:892
 #, 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2911,31 +3291,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:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2944,98 +3324,98 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3043,11 +3423,11 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3055,207 +3435,207 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3263,266 +3643,266 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nekonata klaso de subskribo"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3531,55 +3911,55 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 #, 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:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3589,375 +3969,380 @@ 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:3352
+#: g10/keyedit.c:3353
 #, 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:3372
+#: g10/keyedit.c:3373
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 #, 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:3453
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3460
 #, 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 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:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 #, 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:4639
+#: g10/keyedit.c:4640
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifri datenojn"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3973,7 +4358,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3989,40 +4374,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4030,12 +4415,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4051,44 +4436,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4099,7 +4484,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
 
@@ -4114,23 +4499,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4138,12 +4523,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4155,7 +4540,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4167,50 +4552,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4219,12 +4604,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:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4232,7 +4617,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4240,31 +4625,31 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr ""
 
@@ -4294,635 +4679,608 @@ msgstr "Subskribo-notacio: "
 msgid "Keyring"
 msgstr "�losilaro"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la ne�an�ita\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolas �losilaron '%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "el"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nerealigita �ifrad-metodo"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Dosiero '%s' ekzistas. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nekonata sufikso\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Donu novan dosiernomon"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "skribas al la normala eligo\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: dosierujo kreita\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, 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:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "ne povas konekti�i al '%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemo kun agento - mal�altas uzadon de agento\n"
@@ -4988,7 +5346,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4997,40 +5355,36 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, 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:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "ne povas malfermi %s: %s\n"
@@ -5316,61 +5670,56 @@ msgstr "mankas validaj adresitoj\n"
 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:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "eraro dum kreado de '%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "nenomita ricevonto; provas per sekreta �losilo %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, 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:302
+#: g10/pubkey-enc.c:305
 #, 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:308
+#: g10/pubkey-enc.c:311
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
@@ -5493,87 +5842,87 @@ msgstr ""
 msgid "Is this okay? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Nevalida pasfrazo; bonvolu provi denove"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "malforta �losilo kreita - provas denove\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 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:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 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:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 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:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5581,7 +5930,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5589,50 +5938,50 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, 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:287
+#: g10/sig-check.c:298
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, 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:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:132
+#: g10/sign.c:133
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5640,7 +5989,7 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5659,52 +6008,52 @@ msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 #, 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:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
 "stokastilo!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignoris '%s': ripetita\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5762,51 +6111,51 @@ msgstr "kiraso: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "fido-datenaro-transakcio tro granda\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: malsukcesis krei versiregistron: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: nevalida fido-datenaro kreita\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: fido-datenaro kreita\n"
@@ -5815,78 +6164,78 @@ msgstr "%s: fido-datenaro kreita\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: nevalida fido-datenaro\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 
@@ -5895,7 +6244,7 @@ msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "enigata linio pli longa ol %d signojn\n"
@@ -6063,7 +6412,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6073,345 +6422,1602 @@ msgstr ""
 "Bonvolu memori, ke la subskribodosiero (.sig a� .asc)\n"
 "devas esti la unua dosiero donita en la komandlinio.\n"
 
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, a� mankas linifino\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "�enerala eraro"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "nekonata paketo-speco"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "nekonata versio"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "ne povas malfermi %s: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "nekonata publik�losila metodo"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "enkirasigo malsukcesis: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "nekonata kompendi-metodo"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "malbona publika �losilo"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "malbona sekreta �losilo"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "malbona subskribo"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "eraro en kontrolsumo"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "malbona pasfrazo"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "publika �losilo ne trovita"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "nekonata �ifrad-metodo"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "ne povas malfermi la �losilaron"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "nevalida paketo"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "nevalida kiraso"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "uzantidentigilo ne ekzistas"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "sekreta �losilo ne havebla"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "mal�usta sekreta �losilo uzata"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "ne realigita"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "malbona �losilo"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "legeraro �e dosiero"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "skriberaro �e dosiero"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "nekonata densig-metodo"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "eraro �e malfermo de dosiero"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "eraro �e kreo de dosiero"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "nevalida pasfrazo"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "nerealigita publik�losila metodo"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "nerealigita �ifrad-metodo"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "nekonata klaso de subskribo"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "eraro en fido-datenaro"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "malbona MPI"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "'%s' jam densigita\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "trafis rimedolimon"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "nevalida �losilaro"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "krei novan �losilparon"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "malbona atestilo"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "misformita uzantidentigilo"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "eraro �e fermo de dosiero"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "eraro �e renomado de dosiero"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "eraro �e forvi�o de dosiero"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "neatendita dateno"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "malkongruo de tempostampoj"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "neuzebla publik�losila metodo"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "dosiero ekzistas"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "malforta �losilo"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s-subskribo de: %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "nevalida argumento"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "malbona URI"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "nerealigita URI"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "reteraro"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "ne �ifrita"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "ne traktita"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "legas opciojn el '%s'\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "neuzebla publika �losilo"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "neuzebla sekreta �losilo"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "�losilservila eraro"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "nuligita de uzanto\n"
+msgid "do not use the internal CCID driver"
+msgstr "tute ne uzi la terminalon"
 
-#: util/errors.c:110
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
+
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "ne �ifrita"
+msgid "allow the use of admin card commands"
+msgstr "malkongruaj komandoj\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "mankas subskribitaj datenoj\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:1008
+#, c-format
+msgid "handler for fd %d started\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... �i tio estas cimo (%s:%d:%s)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
+
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: util/logger.c:230
+#: sm/call-dirmngr.c:182
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "vi trovis cimon ... (%s:%d)\n"
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: sm/call-dirmngr.c:216
 #, fuzzy
-msgid "yes"
-msgstr "jes"
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "jJ"
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "ne povas malfermi '%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "skribas sekretan �losilon al '%s'\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "�losilo %08lX: �losilo estas revokita!\n"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "Bona atestilo"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Nenia helpo disponata"
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Bona atestilo"
+
+#: sm/certchain.c:713
+#, fuzzy, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "problemo �e legado de atestilo: %s\n"
+
+#: sm/certchain.c:729
+#, fuzzy
+msgid "certificate not yet valid"
+msgstr "Valida atestilrevoko"
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "problemo �e legado de atestilo: %s\n"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
+"\n"
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "Fingrospuro:"
+
+#: sm/certchain.c:860
+#, fuzzy
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+"Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
+"\n"
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+#, fuzzy
+msgid "certificate chain too long\n"
+msgstr "Valida atestilrevoko"
+
+#: sm/certchain.c:913
+#, fuzzy
+msgid "issuer certificate not found"
+msgstr "Valida atestilrevoko"
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "kontroli subskribon"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "ne"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "nekonata versio"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "%s: nevalida dosiero-versio %d\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "%s: nevalida dosiero-versio %d\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Vi bezonas pasfrazon por mal�losi la sekretan �losilon por la uzanto:\n"
+"\"%.*s\"\n"
+"%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "nevalida kompendi-metodo '%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Nevalida retadreso\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Kreado de �losiloj malsukcesis: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "�losilo '%s' ne trovita: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "eraro dum legado de �losilbloko: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "ripetita atestilo - forvi�ita"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "ripetita atestilo - forvi�ita"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "nevalida respondo de agento\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "skribas al '%s'\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[dosiero]|fari subskribon"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[dosiero]|fari klartekstan subskribon"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "listigi sekretajn �losilojn"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "Valida atestilrevoko"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "forigi �losilojn de la publika �losilaro"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "Bona atestilo"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "Bona atestilo"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "�an�i la pasfrazon"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "krei eligon en askia kiraso"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "tute ne uzi la terminalon"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "devigi v3-subskribojn"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "�iam uzi sigelon (MDC) por �ifrado"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "neinteraga re�imo: neniam demandi"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "supozi \"jes\" �e la plej multaj demandoj"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "supozi \"ne\" �e la plej multaj demandoj"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "aldoni �i tiun sekretan �losilaron al la listo"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOMO|uzi �ifrad-metodon NOMO"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOMO|uzi kompendi-metodon NOMO"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|uzi densig-metodon N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sintakso: gpg [opcioj] [dosieroj]\n"
+"subskribi, kontroli, �ifri a� mal�ifri\n"
+"implicita operacio dependas de la enigataj datenoj\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "uzado: gpg [opcioj] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "ne povas konekti�i al '%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "skribas al '%s'\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "ne povas fermi '%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "      Nombro traktita entute: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "Bona atestilo"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "�losilaro '%s' kreita\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? problemo en kontrolo de revoko: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "%s: nevalida dosiero-versio %d\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Bona subskribo de \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "            alinome \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "fini"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "fF"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "k"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
 
-#: util/secmem.c:97
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
 #, fuzzy
-msgid "WARNING: using insecure memory!\n"
-msgstr "Averto: uzas malsekuran memoron!\n"
+msgid "line too long - skipped\n"
+msgstr "pasfrazo estas tro longa\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: util/secmem.c:98
-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"
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "subskribado malsukcesis: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "eraro dum sendo al '%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "eraro dum sendo al '%s': %s\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
 
-#: util/secmem.c:352
-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"
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "uzado: gpg [opcioj] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "publika �losilo ne trovita"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Komandoj:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "mal�ifrado sukcesis\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "mal�ifrado sukcesis\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [dosiero]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s ne eblas kun %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "%s: ne povas krei dosierujon: %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "ne povas malfermi %s: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: tools/symcryptrun.c:542
+msgid "no --program option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "ne povas krei %s: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "ne povas krei %s: %s\n"
+
+#: tools/symcryptrun.c:606
+#, fuzzy, c-format
+msgid "could not fork: %s\n"
+msgstr "%s: uzanto ne trovita: %s\n"
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "aktualigo malsukcesis: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "aktualigo malsukcesis: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "aktualigo malsukcesis: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "aktualigo malsukcesis: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "ne povas krei '%s': %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "ne povas krei '%s': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "protekto-metodo %d%s ne estas realigita\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "ne povas malfermi '%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "skribas sekretan �losilon al '%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "ne povas stat-i '%s': %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "'%s' ne estas normala dosiero - ignorita\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "noto: dosiero random_seed estas malplena\n"
+
+#, fuzzy
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "ne povas legi '%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "noto: dosiero random_seed ne aktualigita\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "ne povas skribi '%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "ne povas fermi '%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "bonvolu vidi http://www.gnupg.org/why-not-idea.html por pliaj informoj\n"
+#~ "La kvaza�stokastilo estas nur simpla protezo, por ke la\n"
+#~ "programo entute ruli�u; �i neniel estas forta stokastilo!\n"
+#~ "\n"
+#~ "NE UZU DATENOJN KREITAJN DE �I TIU PROGRAMO!!\n"
+#~ "\n"
 
-#, fuzzy
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "\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 ""
-#~ "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
-#~ "kaj fini per '='\n"
+#~ "\n"
+#~ "Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
+#~ "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "sekreta �losilo ne havebla"
+
+#, fuzzy
+#~ msgid "Enter New PIN: "
+#~ msgstr "Donu la uzantidentigilon: "
+
+#, fuzzy
+#~ msgid "Enter PIN: "
+#~ msgstr "Donu la uzantidentigilon: "
+
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
+
+#~ msgid "general error"
+#~ msgstr "�enerala eraro"
+
+#~ msgid "unknown packet type"
+#~ msgstr "nekonata paketo-speco"
+
+#~ msgid "unknown version"
+#~ msgstr "nekonata versio"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "nekonata publik�losila metodo"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "nekonata kompendi-metodo"
+
+#~ msgid "bad public key"
+#~ msgstr "malbona publika �losilo"
+
+#~ msgid "bad secret key"
+#~ msgstr "malbona sekreta �losilo"
+
+#~ msgid "bad signature"
+#~ msgstr "malbona subskribo"
+
+#~ msgid "checksum error"
+#~ msgstr "eraro en kontrolsumo"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "nekonata �ifrad-metodo"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "ne povas malfermi la �losilaron"
+
+#~ msgid "invalid packet"
+#~ msgstr "nevalida paketo"
+
+#~ msgid "invalid armor"
+#~ msgstr "nevalida kiraso"
+
+#~ msgid "no such user id"
+#~ msgstr "uzantidentigilo ne ekzistas"
+
+#~ msgid "secret key not available"
+#~ msgstr "sekreta �losilo ne havebla"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "mal�usta sekreta �losilo uzata"
+
+#~ msgid "not supported"
+#~ msgstr "ne realigita"
+
+#~ msgid "bad key"
+#~ msgstr "malbona �losilo"
+
+#~ msgid "file read error"
+#~ msgstr "legeraro �e dosiero"
+
+#~ msgid "file write error"
+#~ msgstr "skriberaro �e dosiero"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "nekonata densig-metodo"
+
+#~ msgid "file open error"
+#~ msgstr "eraro �e malfermo de dosiero"
+
+#~ msgid "file create error"
+#~ msgstr "eraro �e kreo de dosiero"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "nevalida pasfrazo"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "nerealigita publik�losila metodo"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "nerealigita �ifrad-metodo"
+
+#~ msgid "unknown signature class"
+#~ msgstr "nekonata klaso de subskribo"
+
+#~ msgid "trust database error"
+#~ msgstr "eraro en fido-datenaro"
+
+#~ msgid "resource limit"
+#~ msgstr "trafis rimedolimon"
+
+#~ msgid "invalid keyring"
+#~ msgstr "nevalida �losilaro"
+
+#~ msgid "bad certificate"
+#~ msgstr "malbona atestilo"
+
+#~ msgid "malformed user id"
+#~ msgstr "misformita uzantidentigilo"
+
+#~ msgid "file close error"
+#~ msgstr "eraro �e fermo de dosiero"
+
+#~ msgid "file rename error"
+#~ msgstr "eraro �e renomado de dosiero"
+
+#~ msgid "file delete error"
+#~ msgstr "eraro �e forvi�o de dosiero"
+
+#~ msgid "unexpected data"
+#~ msgstr "neatendita dateno"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "malkongruo de tempostampoj"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "neuzebla publik�losila metodo"
+
+#~ msgid "file exists"
+#~ msgstr "dosiero ekzistas"
+
+#~ msgid "weak key"
+#~ msgstr "malforta �losilo"
+
+#~ msgid "invalid argument"
+#~ msgstr "nevalida argumento"
+
+#~ msgid "bad URI"
+#~ msgstr "malbona URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "nerealigita URI"
+
+#~ msgid "network error"
+#~ msgstr "reteraro"
+
+#~ msgid "not encrypted"
+#~ msgstr "ne �ifrita"
+
+#~ msgid "not processed"
+#~ msgstr "ne traktita"
+
+#~ msgid "unusable public key"
+#~ msgstr "neuzebla publika �losilo"
+
+#~ msgid "unusable secret key"
+#~ msgstr "neuzebla sekreta �losilo"
+
+#~ msgid "keyserver error"
+#~ msgstr "�losilservila eraro"
 
 #, fuzzy
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+#~ msgid "no card"
+#~ msgstr "ne �ifrita"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "mankas subskribitaj datenoj\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... �i tio estas cimo (%s:%d:%s)\n"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "Averto: uzas malsekuran memoron!\n"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+#~ 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"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "AVERTO: nevalida notacia dateno trovita\n"
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 
-#~ msgid "not human readable"
-#~ msgstr "ne homlegebla"
+#~ 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"
+
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6450,10 +8056,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgstr "Mankas uzantidentigilo por �losilo\n"
 
 #, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "eraro dum kreado de pasfrazo: %s\n"
-
-#, fuzzy
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "nekonata �ifrad-metodo"
 
@@ -6466,18 +8068,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "ne povas akiri skribo-FD de servilo por la agento\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "komunikproblemo kun gpg-agent\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "pasfrazo estas tro longa\n"
-
-#~ msgid "invalid response from agent\n"
-#~ msgstr "nevalida respondo de agento\n"
-
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "problemo kun agento: agento redonas 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "elekti flankan �losilon N"
 
@@ -6722,20 +8312,9 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
 
 #, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "skribas al '%s'\n"
-
-#, fuzzy
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "�losilo '%s' ne trovita: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "ne povas krei '%s': %s\n"
-
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "ne povas malfermi %s: %s\n"
@@ -6781,9 +8360,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: AVERTO: malplena dosiero\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "ne povas malfermi %s: %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
 #~ msgstr " %d = Mi fidas iomete\n"
@@ -6820,9 +8396,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: ne povas krei: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: ne povas krei dosierujon: %s\n"
-
 #~ 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\"."
@@ -6832,10 +8405,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgstr "ne povas malfermi %s: %s\n"
 
 #, fuzzy
-#~ msgid "can't open file: %s\n"
-#~ msgstr "ne povas malfermi %s: %s\n"
-
-#, fuzzy
 #~ msgid "error: no ownertrust value\n"
 #~ msgstr "eksporti la posedantofido-valorojn"
 
@@ -6848,9 +8417,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- falsita revoko trovita\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? problemo en kontrolo de revoko: %s\n"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [eksvalidi�os: %s]"
@@ -6862,9 +8428,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "rev"
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "ne povas krei %s: %s\n"
-
 #~ msgid "|[files]|encrypt files"
 #~ msgstr "|[dosieroj]|�ifri dosierojn"
 
@@ -6895,18 +8458,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ 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"
 
@@ -6916,48 +8467,18 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ 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 "|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 "|[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"
 
@@ -6976,15 +8497,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ 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"
 
@@ -7030,9 +8542,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\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"
 
@@ -7225,13 +8734,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ "\n"
 
 #~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
-#~ "\n"
-
-#~ msgid ""
 #~ "No trust values changed.\n"
 #~ "\n"
 #~ msgstr ""
@@ -7301,12 +8803,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid "Invalid user ID revocation"
 #~ msgstr "Nevalida uzantidentigil-revoko"
 
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Valida atestilrevoko"
-
-#~ msgid "Good certificate"
-#~ msgstr "Bona atestilo"
-
 #~ msgid "Invalid certificate revocation"
 #~ msgstr "Nevalida atestilrevoko"
 
@@ -7316,9 +8812,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "subskribo-registro %lu[%d] montras al mal�usta registro.\n"
 
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "ripetita atestilo - forvi�ita"
-
 #~ msgid "tdbio_search_dir failed: %s\n"
 #~ msgstr "tdbio_search_dir malsukcesis: %s\n"
 
@@ -7340,9 +8833,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid "\t%lu due to new pubkeys\n"
 #~ msgstr "\t%lu pro novaj publikaj �losiloj\n"
 
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu �losiloj ignoritaj\n"
-
 #~ msgid "\t%lu keys updated\n"
 #~ msgstr "\t%lu �losiloj aktualigitaj\n"
 
@@ -7392,18 +8882,9 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "�u vi vere volas krei subskriban kaj �ifran �losilon? "
 
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: uzanto ne trovita: %s\n"
-
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "problemo �e legado de atestilo: %s\n"
-
 #~ msgid "can't lock keyring `%s': %s\n"
 #~ msgstr "ne povas �losi la �losilaron '%s': %s\n"
 
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: uzanto ne trovita\n"
-
 #~ msgid "WARNING: can't yet handle long pref records\n"
 #~ msgstr "AVERTO: ne povas trakti longajn preferoregistrojn\n"
 
diff --git a/po/es.po b/po/es.po
index 015af4821..fafbbf9e6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.4.1\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -18,301 +18,749 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "no se puede generar un primo con pbits=%u qbits=%u\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "no se puede bloquear `%s'\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "l�nea demasiado larga"
+
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "frase contrase�a demasiado larga\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Caracter inv�lido en el nombre\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "MPI incorrecto"
+
+# �Por qu� no frase de paso?
+# Porque todo el mundo sabe lo que es una contrase�a
+# y una "frase de paso" no. Soy consciente de que se
+# traduce igual password y passphrase pero el contexto
+# permite saber de lo que se est� hablando.
+# No s�, no s�.
+# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
+# �Es que son m�s listos? :-)
+#
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "Frase contrase�a incorrecta"
+
+# �Por qu� no frase de paso?
+# Porque todo el mundo sabe lo que es una contrase�a
+# y una "frase de paso" no. Soy consciente de que se
+# traduce igual password y passphrase pero el contexto
+# permite saber de lo que se est� hablando.
+# No s�, no s�.
+# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
+# �Es que son m�s listos? :-)
+#
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "Frase contrase�a incorrecta"
 
-#: cipher/random.c:408
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "escribiendo clave privada en `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "el resumen protector %d no puede ser utilizado\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "no se puede crear %s: %s\n"
+
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "no se puede obtener informaci�n de `%s': %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error obteniendo el n�mero de serie: %s\n"
 
-# ignore no es ignorar, es no tener en cuenta, ignorar es not to know.
-# Sugerencia: descartar.
-# 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:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s` no es un fichero regular - descartado\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "nota: el fichero de semillas aleatorias est� vac�o\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: cipher/random.c:474
-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"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "no se puede leer `%s': %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "fallo leyendo la clave\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "no se puede crear %s: %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "no se puede escribir `%s': %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "no se puede cerrar `%s': %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "ATENCI�N: �usando un generador de n�meros aleatorios inseguro!\n"
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "|A|PIN Administrador"
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Repita este PIN: "
+
+#: agent/divert-scd.c:278
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
+
+#: agent/divert-scd.c:290
+#, fuzzy, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "PIN [firmas hechas: %lu]"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
-"El generador de n�meros aleatorios es s�lo un apa�o\n"
-"para poder compilar. �No es en absoluto un generador seguro!\n"
-"\n"
-"�NO USE DATOS GENERADOS POR ESTE PROGRAMA!\n"
+"Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "cambia la frase contrase�a"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "cambia la frase contrase�a"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\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"
+"@\n"
+"Opciones:\n"
+" "
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
+
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "prolijo"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "algo m�s discreto"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "busca claves en un servidor de claves"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "establecer preferencias para todos los ID seleccionados"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "actualiza la base de datos de confianza"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "error creando frase contrase�a: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
-"\n"
-"No hay suficientes bytes aleatorios disponibles. Por favor, haga alg�n\n"
-"otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
-"(se necesitan %d bytes m�s).\n"
 
-#: g10/app-openpgp.c:596
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "fallo al almacenar la huella digital: %s\n"
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:609
+#: agent/gpg-agent.c:303
 #, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "fallo guardando la fecha de creaci�n: %s\n"
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "fallo leyendo la clave\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
-msgstr "la respuesta no incluye la clave p�blica\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
-msgstr "la respuesta no incluye el m�dulo RSA\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
-msgstr "la respuesta no incluye el exponente p�blico RSA\n"
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
 #, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
+msgid "reading options from `%s'\n"
+msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
+msgid "error creating `%s': %s\n"
+msgstr "error creando `%s': %s\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
 #, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "la verificaci�n CHV%d fall�: %s\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
-msgstr "el acceso a �rdenes de administrador no est� configurado\n"
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
-msgstr "error recuperando el estatus CHV de la tarjeta\n"
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "no se puede crear %s: %s\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
-msgstr "�la tarjeta est� bloqueada permanentemente!\n"
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "error enviando a `%s': %s\n"
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "actualizaci�n fallida: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "escribiendo clave privada en `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "directory `%s' created\n"
+msgstr "directorio `%s' creado\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "fstat(%d) fall� en %s: %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: no se puede crear el directorio: %s\n"
+
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
-"%d intentos quedan para PIN de administrador antes de "
-"bloquearpermanentemente la clave\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
-msgstr "|A|PIN Administrador"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
-msgstr "|AN|Nuevo PIN Administrador"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
-msgstr "|N|Nuevo PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, fuzzy, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/app-openpgp.c:1496
+# msgstr "clave %08lX: %d nuevas subclaves\n"
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "\t%lu claves omitidas\n"
+
+#: agent/gpg-agent.c:1650
+#, fuzzy
+msgid "no gpg-agent running in this session\n"
+msgstr "el agente gpg no esta disponible en esta sesi�n\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "error obteniendo nuevo PIN: %s\n"
+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/app-openpgp.c:1546 g10/app-openpgp.c:1996
-msgid "error reading application data\n"
-msgstr "error leyendo datos de la aplicaci�n\n"
+#: agent/preset-passphrase.c:100
+#, fuzzy
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
-msgid "error reading fingerprint DO\n"
-msgstr "error leyendo huella digital DO\n"
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
-msgid "key already exists\n"
-msgstr "la clave ya existe\n"
+#: agent/protect-tool.c:146
+#, fuzzy
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
-msgstr "la clave existente ser� reemplazada\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1568
-msgid "generating new key\n"
-msgstr "generando nueva clave\n"
+#: agent/protect-tool.c:1206
+#, fuzzy
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
+
+# �Por qu� no frase de paso?
+# Porque todo el mundo sabe lo que es una contrase�a
+# y una "frase de paso" no. Soy consciente de que se
+# traduce igual password y passphrase pero el contexto
+# permite saber de lo que se est� hablando.
+# No s�, no s�.
+# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
+# �Es que son m�s listos? :-)
+#
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "Frase contrase�a incorrecta"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "error creando frase contrase�a: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "cancelado"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "error en `%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "fichero de opciones `%s': %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
 #, fuzzy, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "exponente p�blico demasiado grande (m�s de 32 bits)\n"
+msgid "system trustlist `%s' not available\n"
+msgstr "las partes de la clave privada no est�n disponibles\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "error de lectura `%s': %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "fallo al almacenar la clave: %s\n"
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "error leyendo `%s': %s\n"
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
-msgstr "por favor, espere mientras se genera la clave ...\n"
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1901
-msgid "generating key failed\n"
-msgstr "la generaci�n de la clave fall�\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
 #, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "generaci�n de clave completada (%d segundos)\n"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
+#: agent/trustlist.c:453
+#, fuzzy
+msgid "Yes"
+msgstr "s�"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "firma %s, algoritmo de resumen %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "error creando frase contrase�a: %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "no puede abrirse el fichero: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "error leyendo `%s': %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "firmas creadas hasta ahora: %lu\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "PIN [firmas hechas: %lu]"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "error leyendo `%s': %s\n"
+
+#: common/exechelp.c:487
+#, c-format
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "error leyendo `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "error creando `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "%s: usuario no encontrado\n"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "el agente gpg no esta disponible en esta sesi�n\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
+msgid "can't connect to `%s': %s\n"
+msgstr "no se puede conectar con `%s': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "problema de comunicaci�n con el agente gpg\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "problema con el agente: el agente devuelve 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "cancelado por el usuario\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "problema con el agente: el agente devuelve 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "no se pueden desactivar los volcados de core: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "s�"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "sS"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "fin"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "fF"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr "vale|Vale"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr "cancelar|Cancelar"
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr "vV"
+
+#: common/yesno.c:115
+msgid "cC"
+msgstr "cC"
 
 #: g10/armor.c:320
 #, c-format
@@ -389,165 +837,202 @@ msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
 "un MTA defectuoso\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+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 caracteres imprimibles o espacios, y "
+"acabar con un '='\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
+
+#: g10/build-packet.c:980
+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/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "ilegible"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tarjeta OpenPGP no disponible: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[no establecido]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr "hombre"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr "mujer"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "no especificado"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: s�lo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: nombre combinado demasiado largo (m�ximo %d caracteres).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave p�blica: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Error: el login es demasiado largo (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 "Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 msgid "CA fingerprint: "
 msgstr "Huella dactilar CA:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inv�lido de huella dactilar.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "la operaci�n con la clave no es posible: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "�Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "�Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr "�Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -558,191 +1043,139 @@ msgstr ""
 "   PIN = `%s'     PIN Administrador = `%s'\n"
 "Deber�a cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "    (1) Clave de firmado\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n de clave desconocido\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "las partes secretas de la clave no est�n disponibles\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "cambiar sexo del titular de la tarjeta"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "cambiar huella dactilar de una CA"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opci�n forzar firma del PIN"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "men� para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "�rdenes s�lo de administrador\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "clave secreta no disponible"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr "Inserte la tarjeta y pulse Intro o escriba 'c' para cancelar: "
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "borrado de bloque de anillo de claves fallido: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-"Por favor retire la tarjeta actual e inserte la de n�mero de serie:\n"
-"   %.*s\n"
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr "Pulse Intro cuando est� listo"
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr "Introduzca nuevo PIN de administrador: "
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr "Introduzca el nuevo PIN: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr "Introduzca PIN de administrador: "
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr "Introduzca PIN: "
-
-#: g10/cardglue.c:937
-msgid "Repeat this PIN: "
-msgstr "Repita este PIN: "
-
-#: g10/cardglue.c:952
-msgid "PIN not correctly repeated; try again"
-msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output no funciona con esta orden\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -782,46 +1215,46 @@ msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no puede usar un paquete sim�trico ESK debido al modo S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "usando cifrado %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -829,7 +1262,7 @@ msgstr ""
 "AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -838,173 +1271,206 @@ msgstr ""
 "AVISO: forzar el algoritmo de compresi�n %s (%d) va en contra\n"
 "de las preferencias del receptor\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, 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:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "problema trabajando con un paquete cifrado\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "no es posible ejecutar programas remotos\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "no se puede crear el directorio `%s': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "esta plataforma necesita ficheros temporales para llamar a programas "
 "externos\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "no se puede ejecutar el programa `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "no se puede ejecutar el int�rprete de �rdenes `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "el programa externo finaliz� anormalmente\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "no se puede ejecutar el programa externo\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, 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:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, 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/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "clave secreta inutilizable"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 msgid "exporting secret keys not allowed\n"
 msgstr "no se permite exportar claves secretas\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clave %s: no protegida - omitida\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVISO: la clave secreta %s no tiene suma de comprobaci�n simple SK\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "demasiados registros en la cache pk - anulada\n"
+
+#: g10/getkey.c:176
+msgid "[User ID not found]"
+msgstr "[ID de usuario no encontrado]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
+
+#: g10/getkey.c:2612
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "usando subclave %s en vez de clave primaria %s\n"
+
+#: g10/getkey.c:2659
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "clave %s: clave secreta sin clave p�blica - omitida\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/gpg.c:375
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1012,127 +1478,128 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1142,47 +1609,43 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "prolijo"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr "generar mensajes compatibles con PGP 2.x"
 
@@ -1190,7 +1653,7 @@ msgstr "generar mensajes compatibles con PGP 2.x"
 # 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/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1198,7 +1661,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1218,15 +1681,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1236,7 +1699,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1244,71 +1707,71 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1316,18 +1779,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1335,465 +1798,445 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "fichero de opciones `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "leyendo opciones desde `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "no se carga el cifrado de ampliaci�n `%s' por permisos inseguros\n"
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "el agente gpg no esta disponible en esta sesi�n\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 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/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:2986
+#: g10/gpg.c:3010
 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/gpg.c:2988
+#: g10/gpg.c:3012
 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1801,61 +2244,23 @@ 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/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "demasiados registros en la cache pk - anulada\n"
-
-#: g10/getkey.c:175
-msgid "[User ID not found]"
-msgstr "[ID de usuario no encontrado]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
-
-#: g10/getkey.c:2611
-#, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "usando subclave %s en vez de clave primaria %s\n"
-
-#: g10/getkey.c:2658
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "algo m�s discreto"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "tomar las claves de este anillo"
 
@@ -1863,19 +2268,19 @@ msgstr "tomar las claves de este anillo"
 # 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:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1883,7 +2288,7 @@ msgstr ""
 "Sintaxis: gpg [opciones] [ficheros]\n"
 "Confrontar las firmas contra claves conocidas\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1893,7 +2298,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:55
+#: g10/helptext.c:57
 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"
@@ -1905,16 +2310,16 @@ msgstr ""
 "puede acceder a la clave secreta. Conteste \"s�\" para hacer que esta\n"
 "clave se considere como de total confianza\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1937,7 +2342,7 @@ msgstr ""
 "\n"
 "La primera clave (clave primaria) debe ser siempre de tipo capaz de firmar."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1947,16 +2352,16 @@ msgstr ""
 "cifrar. Este algoritmo deb�ria usarse solo en ciertos contextos.\n"
 "Por favor consulte primero a un experto en seguridad."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Introduzca la longitud de la clave"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"s�\" o \"no\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1968,21 +2373,21 @@ msgstr ""
 "buena respuesta a los errores; el sistema intentar� interpretar el valor\n"
 "introducido como un intervalo."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Introduzca el nombre del due�o de la clave"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 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:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Introduzca un comentario opcional"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1996,11 +2401,11 @@ msgstr ""
 "O  para continuar con la generaci�n de clave.\n"
 "S  para interrumpir la generaci�n de clave."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2075,11 +2480,11 @@ msgstr ""
 "\n"
 "Si no sabe qu� contestar, conteste \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"s�\" si quiere firmar TODOS los IDs de usuario"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2087,11 +2492,11 @@ msgstr ""
 "Responda \"s�\" si realmente quiere borrar este ID de usuario.\n"
 "�Tambi�n se perder�n todos los certificados!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"s�\" si quiere borrar esta subclave"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2101,7 +2506,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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2113,13 +2518,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:211
+#: g10/helptext.c:213
 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:215
+#: g10/helptext.c:217
 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"
@@ -2132,7 +2537,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:223
+#: g10/helptext.c:225
 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"
@@ -2142,25 +2547,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:230
+#: g10/helptext.c:232
 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:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Repita la �ltima frase contrase�a para asegurarse de lo que tecle�."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 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:245
+#: g10/helptext.c:247
 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:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2168,7 +2573,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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2197,7 +2602,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:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2207,11 +2612,11 @@ msgstr ""
 "este certificado de revocaci�n. Por favor, que el texto sea breve.\n"
 "Una l�nea vac�a pone fin al texto.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Ayuda no disponible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
@@ -2247,494 +2652,489 @@ msgstr "clave secreta inutilizable"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu claves procesadas hasta ahora\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          no importadas: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, fuzzy, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr "AVISO: la clave %s contiene preferencias para no disponible\n"
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "algoritmos en estos IDs de usuarios:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": algoritmo de resumen preferido %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": algoritmo de compresi�n preferido %s\n"
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-dustribuya esta clave para evitar potenciales problemas de\n"
 "diferencias en los algoritmos.\n"
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %s: reparada la subclave PKS corrompida\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %s: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 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:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %s: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %s: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %s: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %s: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clave %s: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clave %s: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %s: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clave %s: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clave %s: no hay subclave que unir a la clave\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %s: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %s: revocaci�n de subclave inv�lida\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave a�adida\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTA: clave primaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTA: clave secundaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "anillo `%s' creado\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "%s: problema lectura del bloque de clave: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por errores\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2746,17 +3146,17 @@ msgstr ""
 "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o un poco\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2766,46 +3166,46 @@ msgstr ""
 "Un nivel mayor que 1 permite que la clave que est� firmando pueda\n"
 "hacer firmas de confianza en su nombre.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2814,11 +3214,11 @@ msgstr ""
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2827,11 +3227,11 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2840,43 +3240,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 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:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada por la clave %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quiere firmarlo a�n as�? (s/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que firmar con la clave %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2884,11 +3284,11 @@ msgstr ""
 "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
 "pgp2.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2898,31 +3298,31 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, 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:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2931,76 +3331,76 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr "Esto ser� una autofirma.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ATENCION: la firma no se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVISO: la firma no se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La clave tiene s�lo un apuntador u objetos de clave en la propia tarjeta\n"
 "- no hay frase contrase�a que cambiar.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 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:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3008,11 +3408,11 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3020,187 +3420,187 @@ msgstr ""
 "No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Realmente quiere hacer esto? (s/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 msgid "show key fingerprint"
 msgstr "muestra huella dactilar de la clave"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "select subkey N"
 msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 msgid "check signatures"
 msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 msgid "sign selected user IDs locally"
 msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "firmar IDs seleccionados con firma no revocable"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "a�adir un identificador de usuario"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "a�adir un ID fotogr�fico"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 msgid "delete selected user IDs"
 msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 msgid "add a subkey"
 msgstr "a�adir una subclave"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 msgid "delete selected subkeys"
 msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "a�adir una clave de revocaci�n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 msgid "delete signatures from the selected user IDs"
 msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 msgid "set preference list for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "establecer URL del servidor de claves preferido por los IDs seleccionados"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 msgid "revoke selected user IDs"
 msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 msgid "revoke key or selected subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 msgid "enable key"
 msgstr "habilita clave"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 msgid "disable key"
 msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr "mostrar fotos de los ID seleccionados"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3211,226 +3611,226 @@ msgstr ""
 "locales (lsign), una 't' para firmas fiables (tsign), `nr' para firmas no\n"
 "revocables (nrsign) o cualquier combinaci�n de ellas (ltsign, tnrsign, etc)\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Clase de firma desconocida `%s'\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr "�Borrar realmente la clave primaria? (s/N)"
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr "La orden espera un nombre de fichero como argumento\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�De verdad quiere borrar esta clave? (s/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Revocar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�De verdad quiere revocar la clave completa? (s/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�De verdad quiere revocar las subclaves seleccionadas? (s/N)"
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�De verdad quiere revocar esta subclave? (s/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confianza del propietario no puede establecerse si se est� usando\n"
 "una base de datos de confianza propocionada por el usuario\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 msgid "Set preference list to:\n"
 msgstr "Establecer lista de preferencias a:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3438,17 +3838,17 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3456,7 +3856,7 @@ 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:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3465,55 +3865,55 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "Armadura no v�lida"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3522,359 +3922,364 @@ 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:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobreescribir? (s/N) "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, 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:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 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:4922
+#: g10/keyedit.c:4923
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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 %s (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferencia `%s' duplicada\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias de cifrado\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias de resumen\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias de compresi�n\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido `%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr "Autentificaci�n"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Conmutar la capacidad de autentificaci�n\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "El par de claves DSA tendr� %u bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�De qu� tama�o quiere la clave? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "los tama�os de claves %s deben estar en el rango %u-%u\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3890,7 +4295,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3906,38 +4311,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3945,11 +4350,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:1692
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto? (s/n) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3965,44 +4370,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4013,7 +4418,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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 "
@@ -4030,23 +4435,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4054,12 +4459,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4071,7 +4476,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4084,50 +4489,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4135,12 +4540,12 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
 "la orden \"--edit-key\" para crear una subclave con este prop�sito.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4148,7 +4553,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:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4156,30 +4561,30 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "nunca     "
 
@@ -4207,623 +4612,596 @@ msgstr "Notaci�n de firma: "
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "     Huella de subclave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 msgid "      Key fingerprint ="
 msgstr "      Huella de clave ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr "      N�mero de serie de la tarjeta ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "renombrando `%s' en `%s' fallo: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memorizando anillo `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu claves memorizadas hasta ahora (%lu firmas)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu claves memorizadas (%lu firmas)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVISO: las opciones de servidor de claves `%s' no se usan en esta "
 "plataforma\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduzca n�mero(s), O)tro, o F)in >"
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando clave %s de %s servidor %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "enviando clave %s a %s servidor %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 msgid "no keyserver action!\n"
 msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVISO: el manejo de claves procede de una versi�n diferente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr "el servidor de claves no envi� VERSION\n"
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "no se pueden realizar llamadas a un servidor externo de claves tal y\n"
 "como est� compilado el programa\n"
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "la acci�n `%s' no es posible con este esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s no permite usar la versi�n %d del manejador\n"
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 msgid "keyserver timed out\n"
 msgstr "agotado el tiempo de espera para el servidor de claves\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 msgid "keyserver internal error\n"
 msgstr "error interno del servidor de claves\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "error de comunicaci�n con el servidor de claves: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "renovando 1 clave de %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "renovando %d claves desde %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o anormal para una clave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s clave de sesi�n cifrada\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "frase contrase�a generada con algoritmo de resumen desconocido %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave p�blica es %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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$s, creada el %4$s\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contrase�a\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contrase�a\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firmado el %s usando clave %s ID %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "no se pueden desactivar los volcados de core: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat de `%s' fall� en %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) fall� en %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVISO: usando un algoritmo de clave p�blica experimental %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVISO: usando algoritmo de cifrado experimental %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVISO: el algoritmo de resumen %s es una opci�n desaconsejada\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = por favor mu�streme m�s informaci�n\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fichero `%s' ya existe. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 msgid "Overwrite? (y/N) "
 msgstr "�Sobreescribir? (s/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufijo desconocido\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Introduzca nuevo nombre de fichero"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "creado un nuevo fichero de configuraci�n `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, c-format
-msgid "directory `%s' created\n"
-msgstr "directorio `%s' creado\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 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:1157
+#: g10/parse-packet.c:1211
 #, 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:310
-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:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
-
-#: g10/passphrase.c:345
-#, 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/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "no se puede conectar con `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con el agente - inhabilitando el uso del agente\n"
@@ -4887,7 +5265,7 @@ msgstr "         (subclave en clave principal ID %s)"
 msgid "Repeat passphrase: "
 msgstr "Repita frase contrase�a: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4901,38 +5279,34 @@ msgstr ""
 "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:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduzca nombre del fichero JPEG para ID fotogr�fico: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Imposible abrir fichero JPEG `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "�Este JPEG es realmente grande (%d bytes)!\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�Seguro que quiere usarlo? (s/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' no es un fichero JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�Es correcta la foto? (s/n) "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "�no puedo mostrar ID fotogr�fico!\n"
 
@@ -5209,61 +5583,56 @@ msgstr "no hay direcciones v�lidas\n"
 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:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "error creando `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Firma separada.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "no hay datos firmados\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario an�nimo; probando clave secreta %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 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:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: el cifrado %s no aparece en las preferencias del receptor\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: clave secreta %s caduc� el %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
@@ -5383,91 +5752,91 @@ msgstr "(No se di� descripci�n)\n"
 msgid "Is this okay? (y/N) "
 msgstr "�Es correcto? (s/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "las partes de la clave privada no est�n disponibles\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, 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:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Frase contrase�a incorrecta; int�ntelo de nuevo."
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ... \n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATENCI�N: detectada clave d�bil - por favor cambie la frase contrase�a.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 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/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "creada clave d�bil - reintentando\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
 "intentos!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVISO: la subclave de cifrado %s tiene un certificado cruzado inv�lido\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5475,7 +5844,7 @@ msgstr ""
 "la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5483,51 +5852,51 @@ msgstr ""
 "la clave %s fue creada %lu segundos en el futuro (salto en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: clave de la firma %s caducada el %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumiendo firma incorrecta de la clave %s por un bit cr�tico desconocido\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "clave %s: no hay subclave para la firma de revocaci�n de subclave\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5535,7 +5904,7 @@ msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica (demasiado larga).\n"
 "Se usa sin expandir.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5554,13 +5923,13 @@ msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s firma de: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
 "pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5568,38 +5937,38 @@ msgstr ""
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\" omitido: duplicado\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "omitido \"%s\": %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "�esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
@@ -5654,52 +6023,52 @@ msgstr "error de lectura `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, 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:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "registro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "no se puede acceder a `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �el directorio no existe!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "no se puede crear el bloqueo para `%s'\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "no se puede bloquear `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, 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:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
@@ -5708,78 +6077,78 @@ msgstr "%s: se ha creado base de datos de confianza\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no se puede escribir base de datos de confianza\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, 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:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error leyendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, 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:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, 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:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d inv�lida\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error leyendo registro libre: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, 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:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 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"
@@ -5790,7 +6159,7 @@ msgstr ""
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "l�nea de longitud superior a %d caracteres\n"
@@ -5964,7 +6333,7 @@ msgstr ""
 "no se puede actualizar el registro de la versi�n de la base de datos\n"
 "de confianza: fallo de escritura: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5974,368 +6343,1677 @@ 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:192
+#: g10/verify.c:195
 #, 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"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "Error general"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "ha encontrado un error... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "Formato desconocido"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "Versi�n desconocida"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "no puede abrirse el fichero: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "Algoritmo de clave p�blica desconocido"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "renombrando `%s' en `%s' fallo: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "Algoritmo desconocido de resumen de mensaje"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr "establece los par�metros de depuraci�n"
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "Clave p�blica incorrecta"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr "habilita depuraci�n completa"
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "Clave secreta incorrecta"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "Firma incorrecta"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "Error en la suma de comprobaci�n"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-# �Por qu� no frase de paso?
-# Porque todo el mundo sabe lo que es una contrase�a
-# y una "frase de paso" no. Soy consciente de que se
-# traduce igual password y passphrase pero el contexto
-# permite saber de lo que se est� hablando.
-# No s�, no s�.
-# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
-# �Es que son m�s listos? :-)
-#
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "Frase contrase�a incorrecta"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "Clave p�blica no encontrada"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "Algoritmo de cifrado desconocido"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "fallo al almacenar la huella digital: %s\n"
 
-# �y llavero?
-# Hombre... las claves son parecidas a las llaves pero no lo mismo
-# toda la literatura en castellano usa "anillos de claves" si un
-# programa nos habla del llavero �no puedo abrir el llavero? nos
-# miraremos en el bolsillo bastante desconcertados. No creo que se
-# trate de establecer una nomenclatura propia.
-# A lo mejor toda esa literatura est� producida por gente que no sab�a
-# c�mo se dice llavero en ingl�s...
-# Si los ingleses dicen llavero en su idioma �por qu� no vamos a poder
-# nosotros decir lo mismo en el nuestro?
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "No se puede abrir el anillo de claves"
+#: scd/app-openpgp.c:609
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "fallo guardando la fecha de creaci�n: %s\n"
+
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "fallo leyendo la clave\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "paquete inv�lido"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr "la respuesta no incluye la clave p�blica\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "armadura inv�lida"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr "la respuesta no incluye el m�dulo RSA\n"
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "no existe el ID de usuario"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr "la respuesta no incluye el exponente p�blico RSA\n"
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "clave secreta no disponible"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
+
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
+
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "la verificaci�n CHV%d fall�: %s\n"
+
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr "el acceso a �rdenes de administrador no est� configurado\n"
+
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr "error recuperando el estatus CHV de la tarjeta\n"
+
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr "�la tarjeta est� bloqueada permanentemente!\n"
+
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+"%d intentos quedan para PIN de administrador antes de "
+"bloquearpermanentemente la clave\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr "|A|PIN Administrador"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "clave secreta incorrecta"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr "|AN|Nuevo PIN Administrador"
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "no disponible"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr "|N|Nuevo PIN"
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "clave incorrecta"
+#: scd/app-openpgp.c:1535
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "error de lectura"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+msgid "error reading application data\n"
+msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "error de escritura"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+msgid "error reading fingerprint DO\n"
+msgstr "error leyendo huella digital DO\n"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "algoritmo de compresi�n desconocido"
+#: scd/app-openpgp.c:1601
+msgid "key already exists\n"
+msgstr "la clave ya existe\n"
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "error al abrir fichero"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr "la clave existente ser� reemplazada\n"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "error al crear fichero"
+#: scd/app-openpgp.c:1607
+msgid "generating new key\n"
+msgstr "generando nueva clave\n"
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "frase contrase�a incorrecta"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algoritmo de clave p�blica no implementado"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "algoritmo de cifrado no implementado"
+#: scd/app-openpgp.c:1788
+#, fuzzy, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "exponente p�blico demasiado grande (m�s de 32 bits)\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "clase de firma desconocida"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "error en la base de datos de confianza"
+#: scd/app-openpgp.c:1866
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "fallo al almacenar la clave: %s\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "MPI incorrecto"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "l�mite de recurso"
+#: scd/app-openpgp.c:1939
+msgid "generating key failed\n"
+msgstr "la generaci�n de la clave fall�\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "anillo inv�lido"
+#: scd/app-openpgp.c:1942
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "certificado incorrecto"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "ID de usuario mal formado"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "error al cerrar fichero"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "error al renombrar fichero"
+#: scd/app-openpgp.c:2184
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "PIN [firmas hechas: %lu]"
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "error al borrar fichero"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "datos inesperados"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
 
-# 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.
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "conflicto con el sello de fecha"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "algoritmo de clave p�blica no utilizable"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "leyendo opciones desde `%s'\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "el fichero existe"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "clave d�bil"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "argumento inv�lido"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "URI incorrecto"
+#: scd/scdaemon.c:126
+#, fuzzy
+msgid "do not use the internal CCID driver"
+msgstr "no usa la terminal en absoluto"
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "URI no disponible"
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "error de red"
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "ver �rdenes de administrador"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "no cifrado"
+#: scd/scdaemon.c:191
+#, fuzzy
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "no procesado"
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "clave p�blica inutilizable"
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "clave secreta inutilizable"
+#: scd/scdaemon.c:1008
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "error del servidor de claves"
+#: scd/scdaemon.c:1013
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#: util/errors.c:109
-msgid "canceled"
-msgstr "cancelado"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "caracter inv�lido radix64 %02X omitido\n"
 
-#: util/errors.c:110
-msgid "no card"
-msgstr "no hay tarjeta"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#: util/errors.c:111
+#: sm/call-dirmngr.c:216
 #, fuzzy
-msgid "no data"
-msgstr "no hay datos firmados\n"
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: util/logger.c:158
-msgid "ERROR: "
-msgstr "ERROR: "
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: util/logger.c:161
-msgid "WARNING: "
-msgstr "ATENCION: "
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
 
-# bicho :-)
-# �Error simplemente?
-# Uf, preferir�a bug, si leo "error" voy a pensar en otra cosa distinta...
-#: util/logger.c:224
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "No se puede abrir `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "no se permite exportar claves secretas\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... esto es un bug (%s:%d:%s)\n"
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "fallo al almacenar la clave: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "NOTA: la clave ha sido revocada"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "Certificado correcto"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Clave disponible en: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "la comprobaci�n de la firma creada fall�: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Certificado correcto"
+
+#: sm/certchain.c:713
+#, fuzzy, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "problema en la lectura del certificado: %s\n"
+
+#: sm/certchain.c:729
+#, fuzzy
+msgid "certificate not yet valid"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "problema en la lectura del certificado: %s\n"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"No se ha encontrado ning�n certificado sin valor de confianza.\n"
+"\n"
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "Huella dactilar CA:"
+
+#: sm/certchain.c:860
+#, fuzzy
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+"No se ha encontrado ning�n certificado sin valor de confianza.\n"
+"\n"
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "la comprobaci�n de la firma creada fall�: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+#, fuzzy
+msgid "certificate chain too long\n"
+msgstr "Revocaci�n de certificado v�lida"
 
-#: util/logger.c:230
+#: sm/certchain.c:913
+#, fuzzy
+msgid "issuer certificate not found"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "verifica una firma"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "ha encontrado un error... (%s:%d)\n"
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "s�"
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "sS"
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "[no establecido]"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "Error: respuesta no v�lida.\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "Error: respuesta no v�lida.\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Necesita una frase contrase�a para desbloquear la clave secreta\n"
+"del usuario: \"%.*s\"\n"
+"%u bits, clave %s, ID %s, creada el %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Direcci�n inv�lida\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Creaci�n de la clave fallida: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "clave secreta \"%s\" no encontrada: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "error leyendo bloque de claves: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "certificado duplicado - eliminado"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "certificado duplicado - eliminado"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "borrado de bloque de anillo de claves fallido: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(No se di� descripci�n)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error creando frase contrase�a: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[file]|crea una firma"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[file]|crea una firma en texto claro"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "lista claves secretas"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "elimina claves del anillo p�blico"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "Certificado correcto"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "Certificado correcto"
+
+#: sm/gpgsm.c:263
+#, fuzzy
+msgid "register a smartcard"
+msgstr "a�adir clave a tarjeta"
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "cambia la frase contrase�a"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "crea una salida ascii con armadura"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "usa la clave por defecto como destinatario"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "no usa la terminal en absoluto"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "fuerza firmas v3"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "siempre usa un MDC para cifrar"
+
+#: sm/gpgsm.c:347
+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.
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "asume \"s�\" en casi todas las preguntas"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "asume \"no\" en casi todas las preguntas"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "a�ade este anillo a la lista de anillos"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "a�ade este anillo secreto a la lista"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|SERVIDOR|usa este servidor de claves"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|usa el algoritmo de compresi�n N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sintaxis: gpg [opciones] [ficheros]\n"
+"firma, comprueba, cifra o descifra\n"
+"la operaci�n por defecto depende de los datos de entrada\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "uso: gpgm [opciones] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "no se puede conectar con `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "no se puede acceder a `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Cantidad total procesada: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "Certificado correcto"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error obteniendo el n�mero de serie: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "error leyendo `%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "anillo `%s' creado\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "fallo al almacenar la huella digital: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "fallo al almacenar la clave: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error obteniendo el n�mero de serie: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error obteniendo el n�mero de serie: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? problema comprobando la revocaci�n: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "error obteniendo nuevo PIN: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "error leyendo `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "Error: formato inv�lido de huella dactilar.\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "la comprobaci�n de la firma creada fall�: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Firmado el %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Firma correcta de \"%s\""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                alias \"%s\""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "fin"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "fF"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
-msgstr "vale|Vale"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
-msgstr "cancelar|Cancelar"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
+msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
-msgstr "vV"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
+msgstr ""
 
-#: util/miscutil.c:411
-msgid "cC"
-msgstr "cC"
+#: tools/gpg-connect-agent.c:126
+#, fuzzy
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "l�nea demasiado larga"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "opci�n desconocida `%s'\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "firma fallida: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "fallo leyendo la clave\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "error enviando a `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "error enviando a `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+#, fuzzy
+msgid "Options useful for debugging"
+msgstr "habilita depuraci�n completa"
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "uso: gpg [opciones] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "Clave p�blica no encontrada"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error escribiendo anillo `%s': %s\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? :-)
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@�rdenes:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "descifrado correcto\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "descifrado correcto\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [nombre_fichero]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "�%s no permitido con %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "fstat de `%s' fall� en %s: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "no se puede crear el directorio `%s': %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "no se puede abrir `%s': %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "error leyendo `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "error en `%s': %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "no es posible ejecutar programas remotos\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "no se puede crear %s: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "no se puede crear %s: %s\n"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "ATENCI�N: �se est� usando memoria insegura!\n"
+#: tools/symcryptrun.c:606
+#, fuzzy, c-format
+msgid "could not fork: %s\n"
+msgstr "%s: usuario no encontrado: %s\n"
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "actualizaci�n fallida: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "borrado de bloque de anillo de claves fallido: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "actualizaci�n fallida: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "actualizaci�n fallida: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "actualizaci�n fallida: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "%s: no se puede crear el anillo: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "no se puede crear fichero de respaldo `%s': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "el resumen protector %d no puede ser utilizado\n"
+
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "no se puede generar un primo con pbits=%u qbits=%u\n"
+
+#~ 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"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "no se puede bloquear `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "escribiendo clave privada en `%s'\n"
 
-#: util/secmem.c:98
-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"
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "no se puede obtener informaci�n de `%s': %s\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operaci�n imposible sin memoria segura inicializada\n"
+# ignore no es ignorar, es no tener en cuenta, ignorar es not to know.
+# Sugerencia: descartar.
+# 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".
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s` no es un fichero regular - descartado\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "nota: el fichero de semillas aleatorias est� vac�o\n"
 
-#: util/secmem.c:352
-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"
+#~ 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"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "no se puede leer `%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "no se puede escribir `%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "no se puede cerrar `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "ATENCI�N: �usando un generador de n�meros aleatorios inseguro!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "por favor vea http://www.gnupg.org/why-not-idea.html para m�s "
-#~ "informaci�n\n"
+#~ "El generador de n�meros aleatorios es s�lo un apa�o\n"
+#~ "para poder compilar. �No es en absoluto un generador seguro!\n"
+#~ "\n"
+#~ "�NO USE DATOS GENERADOS POR ESTE PROGRAMA!\n"
+#~ "\n"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "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 ""
-#~ "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, "
-#~ "y acabar con un '='\n"
+#~ "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"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
+#~ 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"
+#~ "No hay suficientes bytes aleatorios disponibles. Por favor, haga alg�n\n"
+#~ "otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
+#~ "(se necesitan %d bytes m�s).\n"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
+#~ msgid "card reader not available\n"
+#~ msgstr "clave secreta no disponible"
+
+#~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
+#~ msgstr "Inserte la tarjeta y pulse Intro o escriba 'c' para cancelar: "
+
+#~ msgid ""
+#~ "Please remove the current card and insert the one with serial number:\n"
+#~ "   %.*s\n"
+#~ msgstr ""
+#~ "Por favor retire la tarjeta actual e inserte la de n�mero de serie:\n"
+#~ "   %.*s\n"
 
-#~ 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"
+#~ msgid "Hit return when ready or enter 'c' to cancel: "
+#~ msgstr "Pulse Intro cuando est� listo"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
+#~ msgid "Enter New Admin PIN: "
+#~ msgstr "Introduzca nuevo PIN de administrador: "
 
-#~ msgid "not human readable"
-#~ msgstr "ilegible"
+#~ msgid "Enter New PIN: "
+#~ msgstr "Introduzca el nuevo PIN: "
+
+#~ msgid "Enter Admin PIN: "
+#~ msgstr "Introduzca PIN de administrador: "
+
+#~ msgid "Enter PIN: "
+#~ msgstr "Introduzca PIN: "
+
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "el agente gpg no esta disponible en esta sesi�n\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "algoritmos en estos IDs de usuarios:\n"
+
+#~ msgid "general error"
+#~ msgstr "Error general"
+
+#~ msgid "unknown packet type"
+#~ msgstr "Formato desconocido"
+
+#~ msgid "unknown version"
+#~ msgstr "Versi�n desconocida"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "Algoritmo de clave p�blica desconocido"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "Algoritmo desconocido de resumen de mensaje"
+
+#~ msgid "bad public key"
+#~ msgstr "Clave p�blica incorrecta"
+
+#~ msgid "bad secret key"
+#~ msgstr "Clave secreta incorrecta"
+
+#~ msgid "bad signature"
+#~ msgstr "Firma incorrecta"
+
+#~ msgid "checksum error"
+#~ msgstr "Error en la suma de comprobaci�n"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "Algoritmo de cifrado desconocido"
+
+# �y llavero?
+# Hombre... las claves son parecidas a las llaves pero no lo mismo
+# toda la literatura en castellano usa "anillos de claves" si un
+# programa nos habla del llavero �no puedo abrir el llavero? nos
+# miraremos en el bolsillo bastante desconcertados. No creo que se
+# trate de establecer una nomenclatura propia.
+# A lo mejor toda esa literatura est� producida por gente que no sab�a
+# c�mo se dice llavero en ingl�s...
+# Si los ingleses dicen llavero en su idioma �por qu� no vamos a poder
+# nosotros decir lo mismo en el nuestro?
+#~ msgid "can't open the keyring"
+#~ msgstr "No se puede abrir el anillo de claves"
+
+#~ msgid "invalid packet"
+#~ msgstr "paquete inv�lido"
+
+#~ msgid "invalid armor"
+#~ msgstr "armadura inv�lida"
+
+#~ msgid "no such user id"
+#~ msgstr "no existe el ID de usuario"
+
+#~ msgid "secret key not available"
+#~ msgstr "clave secreta no disponible"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "clave secreta incorrecta"
+
+#~ msgid "not supported"
+#~ msgstr "no disponible"
+
+#~ msgid "bad key"
+#~ msgstr "clave incorrecta"
+
+#~ msgid "file read error"
+#~ msgstr "error de lectura"
+
+#~ msgid "file write error"
+#~ msgstr "error de escritura"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "algoritmo de compresi�n desconocido"
+
+#~ msgid "file open error"
+#~ msgstr "error al abrir fichero"
+
+#~ msgid "file create error"
+#~ msgstr "error al crear fichero"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "frase contrase�a incorrecta"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algoritmo de clave p�blica no implementado"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "algoritmo de cifrado no implementado"
+
+#~ msgid "unknown signature class"
+#~ msgstr "clase de firma desconocida"
+
+#~ msgid "trust database error"
+#~ msgstr "error en la base de datos de confianza"
+
+#~ msgid "resource limit"
+#~ msgstr "l�mite de recurso"
+
+#~ msgid "invalid keyring"
+#~ msgstr "anillo inv�lido"
+
+#~ msgid "bad certificate"
+#~ msgstr "certificado incorrecto"
+
+#~ msgid "malformed user id"
+#~ msgstr "ID de usuario mal formado"
+
+#~ msgid "file close error"
+#~ msgstr "error al cerrar fichero"
+
+#~ msgid "file rename error"
+#~ msgstr "error al renombrar fichero"
+
+#~ msgid "file delete error"
+#~ msgstr "error al borrar fichero"
+
+#~ msgid "unexpected data"
+#~ msgstr "datos inesperados"
+
+# 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.
+#~ msgid "timestamp conflict"
+#~ msgstr "conflicto con el sello de fecha"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "algoritmo de clave p�blica no utilizable"
+
+#~ msgid "file exists"
+#~ msgstr "el fichero existe"
+
+#~ msgid "weak key"
+#~ msgstr "clave d�bil"
+
+#~ msgid "invalid argument"
+#~ msgstr "argumento inv�lido"
+
+#~ msgid "bad URI"
+#~ msgstr "URI incorrecto"
+
+#~ msgid "unsupported URI"
+#~ msgstr "URI no disponible"
+
+#~ msgid "network error"
+#~ msgstr "error de red"
+
+#~ msgid "not encrypted"
+#~ msgstr "no cifrado"
+
+#~ msgid "not processed"
+#~ msgstr "no procesado"
+
+#~ msgid "unusable public key"
+#~ msgstr "clave p�blica inutilizable"
+
+#~ msgid "unusable secret key"
+#~ msgstr "clave secreta inutilizable"
+
+#~ msgid "keyserver error"
+#~ msgstr "error del servidor de claves"
+
+#~ msgid "no card"
+#~ msgstr "no hay tarjeta"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "no hay datos firmados\n"
+
+#~ msgid "ERROR: "
+#~ msgstr "ERROR: "
+
+#~ msgid "WARNING: "
+#~ msgstr "ATENCION: "
+
+# bicho :-)
+# �Error simplemente?
+# Uf, preferir�a bug, si leo "error" voy a pensar en otra cosa distinta...
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... esto es un bug (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "ATENCI�N: �se est� usando memoria insegura!\n"
+
+#~ 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"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "operaci�n imposible sin memoria segura inicializada\n"
+
+#~ 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"
+
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6371,9 +8049,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "No hay clave secreta para tal usuario\n"
 
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "error obteniendo el n�mero de serie: %s\n"
-
 #~ msgid "length of RSA modulus is not %d\n"
 #~ msgstr "la longitud del m�dulo RSA no es %d\n"
 
@@ -6392,18 +8067,9 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "no puedo conseguir el FD de escritura para el agente\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "problema de comunicaci�n con el agente gpg\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "frase contrase�a demasiado larga\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "respuesta del agente inv�lida\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "problema con el agente: el agente devuelve 0x%lx\n"
-
 #~ 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"
 
@@ -6446,18 +8112,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ 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"
 
@@ -6467,9 +8121,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ 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"
 
@@ -6478,45 +8129,12 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ 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 "|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 "|[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"
 
@@ -6536,15 +8154,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ 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"
 
@@ -6570,9 +8179,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "--nrlsign-key user-id"
 #~ msgstr "--nrlsign-key id-usuario"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "no se puede abrir `%s': %s\n"
-
 #~ msgid "key %08lX: key has been revoked!\n"
 #~ msgstr "clave %08lX: �esta clave ha sido revocada!\n"
 
@@ -6798,9 +8404,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev-  se encontr� una revocaci�n falsificada\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? problema comprobando la revocaci�n: %s\n"
-
 #~ msgid ""
 #~ "\"\n"
 #~ "locally signed with your key %08lX at %s\n"
@@ -6829,9 +8432,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\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"
 
@@ -6891,9 +8491,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ "comprobando en profundidad %d firmado=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
 #~ "d\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: no se puede crear el directorio: %s\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr "Si quiere usar esta clave revocada de todos modos, conteste \"s�\"."
 
@@ -6963,9 +8560,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "lo siento, no puede hacerse en modo de proceso por lotes\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "no puede abrirse el fichero: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "error: falta ':'\n"
 
@@ -7080,13 +8674,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ "\n"
 
 #~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "No se ha encontrado ning�n certificado sin valor de confianza.\n"
-#~ "\n"
-
-#~ msgid ""
 #~ "No trust values changed.\n"
 #~ "\n"
 #~ msgstr ""
@@ -7109,12 +8696,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "Do you really need such a large keysize? "
 #~ msgstr "�De verdad necesita una clave tan grande? "
 
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: usuario no encontrado: %s\n"
-
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "problema en la lectura del certificado: %s\n"
-
 #~ msgid "too many entries in unk cache - disabled\n"
 #~ msgstr "demasiados registros en la cache unk - anulada\n"
 
@@ -7127,9 +8708,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "key %08lX: our copy has no self-signature\n"
 #~ msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
 
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: usuario no encontrado\n"
-
 #~ msgid "assuming bad MDC due to an unknown critical bit\n"
 #~ msgstr "asumiendo MDC incorrecto debido a un bit cr�tico desconocido\n"
 
@@ -7185,12 +8763,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "Invalid user ID revocation"
 #~ msgstr "Revocaci�n de ID de usuario inv�lida."
 
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Revocaci�n de certificado v�lida"
-
-#~ msgid "Good certificate"
-#~ msgstr "Certificado correcto"
-
 #~ msgid "Invalid certificate revocation"
 #~ msgstr "Certificado de revocaci�n incorrecto"
 
@@ -7200,9 +8772,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "registro de firma %lu[%d] apunta al registro equivocado.\n"
 
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "certificado duplicado - eliminado"
-
 #~ msgid "tdbio_search_dir failed: %s\n"
 #~ msgstr "tdbio_search_dir fallida: %s\n"
 
@@ -7227,10 +8796,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "\t%lu due to new pubkeys\n"
 #~ msgstr "\t%lu debido a las nuevas claves p�blicas\n"
 
-# msgstr "clave %08lX: %d nuevas subclaves\n"
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu claves omitidas\n"
-
 #~ msgid "\t%lu keys updated\n"
 #~ msgstr "\t%lu claves actualizadas\n"
 
@@ -7273,9 +8838,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgstr ""
 #~ "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
 
-#~ msgid "%s: can't create keyring: %s\n"
-#~ msgstr "%s: no se puede crear el anillo: %s\n"
-
 #~ msgid "RSA key cannot be used in this version\n"
 #~ msgstr "No puede usarse clave RSA en esta versi�n\n"
 
@@ -7292,12 +8854,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ "Las claves RSA est�n en desuso, considere la creaci�n de una nueva clave "
 #~ "para futuros usos\n"
 
-#~ msgid "set debugging flags"
-#~ msgstr "establece los par�metros de depuraci�n"
-
-#~ msgid "enable full debugging"
-#~ msgstr "habilita depuraci�n completa"
-
 #~ msgid "do not write comment packets"
 #~ msgstr "no escribe paquetes de comentario"
 
@@ -7387,9 +8943,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "can't lock keyring `%': %s\n"
 #~ msgstr "no puede bloquearse el anillo p�blico `%s': %s\n"
 
-#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "error escribiendo anillo `%s': %s\n"
-
 #~ msgid "writing keyblock\n"
 #~ msgstr "escribiendo bloque de claves\n"
 
@@ -7404,12 +8957,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "Can't check MDC: %s\n"
 #~ msgstr "Imposible comprobar la firma: %s\n"
 
-#~ msgid "Usage: gpgm [options] [files] (-h for help)"
-#~ msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
-
-#~ msgid "usage: gpgm [options] "
-#~ msgstr "uso: gpgm [opciones] "
-
 #~ msgid "chained sigrec %lu has a wrong owner\n"
 #~ msgstr "registro de firma encadenado %lu tiene el propietario equivocado\n"
 
diff --git a/po/et.po b/po/et.po
index 048e9b730..0d77f8b92 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -14,296 +14,722 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cipher/primegen.c:121
+#: agent/call-pinentry.c:193
 #, 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"
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "entroopia kogumise moodul puudub\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "rida on liiga pikk\n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "`%s' ei �nnestu avada\n"
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "liiga pikk parool\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Lubamatu s�mbol nimes\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "halb MPI"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "halb parool"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "halb parool"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "kirjutan salajase v�tme faili `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "viga parooli loomisel: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "m�rkus: random_seed fail on t�hi\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "`%s' ei �nnestu lugeda: %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "m�rkus: random_seed faili ei uuendatud\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "`%s' ei �nnestu luua: %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "`%s' ei �nnestu kirjutada: %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "`%s' ei �nnestu sulgeda: %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
+#: agent/divert-scd.c:217
+msgid "Admin PIN"
+msgstr ""
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Korrake parooli: "
+
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "parooli ei korratud �ieti; proovige uuesti"
+
+#: agent/divert-scd.c:290
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
-"Juhuarvude generaator on ainult t�hi kest, et programmid\n"
-"k�iks - see EI OLE tugev juhuarvude generaator!\n"
-"\n"
-"�RGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: cipher/rndegd.c:202
-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"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muuda parooli"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 msgstr ""
-"Palun oodake, kogutakse entroopiat. Igavuse v�ltimiseks v�ite teha arvutiga\n"
-"mingit t��d, see t�stab ka entroopia kvaliteeti.\n"
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "muuda parooli"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"\n"
-"Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
-"et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
+"@\n"
+"V�tmed:\n"
+" "
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "ole jutukas"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "ole m�nev�rra vaiksem"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "otsi v�tmeid v�tmeserverist"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "uuenda usalduse andmebaasi"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "viga parooli loomisel: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
+msgstr ""
+
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "v�tmete fail `%s': %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "loen v�tmeid failist `%s'\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "viga `%s' loomisel: %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "%s ei �nnestu luua: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "uuendamine eba�nnestus: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "kirjutan salajase v�tme faili `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: kataloog on loodud\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: kataloogi ei �nnestu luua: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "viga parooli loomisel: %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: j�tsin vahele: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "viga v�tmebloki lugemisel: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: viga vaba kirje lugemisel: %s\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' on juba pakitud\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "genereeri uus v�tmepaar"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Palun sisestage parool; see on salajane tekst \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Palun sisestage parool; see on salajane tekst \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "halb parool"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "Katkesta"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "v�tit '%s' ei leitud: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "viga lugemisel: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+msgid "Yes"
+msgstr "jah"
 
-#: g10/app-openpgp.c:1904
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "V�tme genereerimine eba�nnestus: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "viga parooli loomisel: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "faili ei �nnestu avada: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "viga `%s' loomisel: %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[Kasutaja id puudub]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "probleem gpg-agent programmiga suhtlemisel\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "probleem agendiga: agent tagastas 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "katkestatud kasutaja poolt\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "probleem agendiga: agent tagastas 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "jah"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "jJ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "ei"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "eE"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "v�lju"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "vV"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "ei leia OpenPGP andmeid.\n"
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: g10/armor.c:320
 #, c-format
@@ -381,176 +807,213 @@ msgid ""
 msgstr ""
 "kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
+"ning l�pus peab olema '='\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "pole inimese poolt loetav"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "P�hjus puudub"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "ei t��deldud"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -558,207 +1021,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "salajane v�ti ei ole k�ttesaadav"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr ""
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr ""
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Korrake parooli: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "parooli ei korratud �ieti; proovige uuesti"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "v�ti --output ei t��ta selle k�suga\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -801,53 +1212,53 @@ msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K moodi t�ttu ei saa s�mmeetrilist ESK paketti kasutada\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "kasutan �iffrit %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -855,173 +1266,209 @@ msgid ""
 msgstr ""
 "pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, 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:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �ifri n�rga v�tmega.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "probleem kr�ptitud paketi k�sitlemisel\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "see platvorm n�uab v�liste programmide k�ivitamiseks ajutiste failide "
 "kasutamist\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "v�line programm l�petas erandlikult\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "v�list programmi ei �nnestu k�ivitada\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "ei �nnestu lugeda v�lise programmi vastust: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 "`%s' jaoks pole t�histamise v�tmeid\n"
 "\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "mittekasutatav salajane v�ti"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, 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:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, 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:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[Kasutaja id puudub]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, 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:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
+
+#: g10/getkey.c:2659
+#, 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/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1029,128 +1476,129 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1160,51 +1608,47 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "ole jutukas"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1212,7 +1656,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1232,15 +1676,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1250,7 +1694,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1258,638 +1702,577 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "v�tmete fail `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "loen v�tmeid failist `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:3012
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[Kasutaja id puudub]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, 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:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
-
-#: g10/getkey.c:2658
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "ole m�nev�rra vaiksem"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "v�ta v�tmed sellest v�tmehoidlast"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1897,7 +2280,7 @@ msgstr ""
 "S�ntaks: gpg [v�tmed] [failid]\n"
 "kontrolli allkirju tuntud usaldusv��rsete v�tmetega\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1906,7 +2289,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:55
+#: g10/helptext.c:57
 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"
@@ -1918,17 +2301,17 @@ 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:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1942,7 +2325,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1952,16 +2335,16 @@ msgstr ""
 "kr�pteerimiseks. Seda algoritmi tuleks kasutada ainult teatud piirides.\n"
 "Enne kasutamist konsulteerige palun oma turva eksperdiga."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Sisestage v�tmepikkus"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastake \"jah\" v�i \"ei\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1973,19 +2356,19 @@ msgstr ""
 "saa korrektset veateadet, kuna s�steem �ritab antud v��rtust\n"
 "t�lgendada vahemikuna."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Sisestage v�tmehoidja nimi"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 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:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Te v�ite n��d sisestada kommentaari"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1999,11 +2382,11 @@ msgstr ""
 "O  et j�tkata v�tme loomist.\n"
 "V  et l�petada v�tme loomine."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2074,12 +2457,12 @@ msgstr ""
 "\n"
 "Kui te ei tea �iget vastust, vastake \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Kui te soovite allkirjastada K�IK kasutaja IDd, vastake \"jah\""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2087,11 +2470,11 @@ msgstr ""
 "Kui te t�esti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
 "Sertifikaadid kustutatakse samuti!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Kui selle alamv�tme v�ib kustutada, vastake \"jah\""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2101,7 +2484,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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2113,13 +2496,13 @@ msgstr ""
 "kasutab, sest see v�ti v�ib moodustada usaldussuhte l�bi m�ne juba\n"
 "sertifitseeritud v�tme."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 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:215
+#: g10/helptext.c:217
 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"
@@ -2133,7 +2516,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:223
+#: g10/helptext.c:225
 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"
@@ -2143,23 +2526,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:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "Sisestage palun failinimi, mida allkirjastada"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastake \"jah\", kui faili v�ib �le kirjutada"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2167,7 +2550,7 @@ msgstr ""
 "Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
 "kasutatakse vaikimisi faili (nimi on nurksulgudes)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2196,7 +2579,7 @@ msgstr ""
 "      kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
 "aadressi.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2206,11 +2589,11 @@ msgstr ""
 "soovite seda t�histamise sertifikaati esitada. Palun kirjutage\n"
 "l�hidalt. T�hi rida l�petab teksti.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Abiinfo puudub"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
@@ -2246,495 +2629,490 @@ msgstr "mittekasutatav salajane v�ti"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu v�tit on seni t��deldud\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele j�etud uusi v�tmeid: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamv�tmeid: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, 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:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 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:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, 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:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, 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:1203
+#: g10/import.c:1202
 #, 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:1233
+#: g10/import.c:1232
 #, 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:1276
+#: g10/import.c:1275
 #, 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:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, 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:1391
+#: g10/import.c:1390
 #, 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:1409
+#: g10/import.c:1408
 #, 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:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, 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:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, 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:1788
+#: g10/import.c:1787
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "v�tmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 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:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2747,63 +3125,63 @@ msgstr ""
 "passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Usaldan v�hesel m��ral\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Usaldan t�iesti\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 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:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2812,11 +3190,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 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:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2825,11 +3203,11 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2838,54 +3216,54 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 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:780
+#: g10/keyedit.c:781
 #, 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:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 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:891
+#: g10/keyedit.c:892
 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2895,32 +3273,32 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, 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:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2929,100 +3307,100 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3030,11 +3408,11 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3042,206 +3420,206 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3249,241 +3627,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3491,19 +3869,19 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3511,7 +3889,7 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3520,55 +3898,55 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 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:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3577,370 +3955,375 @@ 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:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 #, 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:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 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:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "kr�pteeri andmed"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3956,7 +4339,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3972,40 +4355,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4013,12 +4396,12 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4034,44 +4417,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4082,7 +4465,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
 
@@ -4097,23 +4480,23 @@ msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4121,12 +4504,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4138,7 +4521,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4150,50 +4533,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4203,48 +4586,48 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, 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:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, 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:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "mitte kunagi"
 
@@ -4272,628 +4655,601 @@ msgstr "Allkirja noteerimine: "
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "    Alamv�tme s�rmej�lg:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ei ole muudetud\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uus\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Palun parandage see v�imalik turvaprobleem\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrollin v�tmehoidlat `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "veider suurus kr�ptitud sessiooni v�tme jaoks (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kr�pteeritud sessiooni v�ti\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kr�pteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "kr�pteeritud �he parooliga\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "V�tme leiate: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "realiseerimata �ifri algoritm"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = esita palun t�iendavat infot\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fail `%s' on olemas. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: tundmatu suffiks\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Sisestage uus failinimi"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "kirjutan standardv�ljundisse\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "uus omaduste fail `%s' on loodud\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: kataloog on loodud\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 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:1157
+#: g10/parse-packet.c:1211
 #, 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:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
@@ -4959,7 +5315,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4973,39 +5329,35 @@ msgstr ""
 "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:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\": ei ole JPEG fail\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "On see foto �ige (j/E/v)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "foto ID ei saa n�idata!\n"
 
@@ -5284,61 +5636,56 @@ msgstr "kehtivaid aadresse pole\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "viga `%s' loomisel: %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, 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:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, me oleme anon��mne teate saaja.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, 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:302
+#: g10/pubkey-enc.c:305
 #, 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:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
@@ -5465,143 +5812,143 @@ msgstr "(Kirjeldust ei antud)\n"
 msgid "Is this okay? (y/N) "
 msgstr "On see h�sti? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Vigane parool; palun proovige uuesti"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "loon salajase v�tme kaitseks mittesoovitavat 16 bitist kontrollsummat\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "loodi n�rk v�ti - proovin uuesti\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %"
 "d korda!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "HOIATUS: allkirja l�hend on teatega konfliktne\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, fuzzy, c-format
 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:113
+#: g10/sig-check.c:119
 #, 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:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 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:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 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:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "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:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "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:205
+#: g10/sig-check.c:215
 #, 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:287
+#: g10/sig-check.c:298
 #, 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:544
+#: g10/sig-check.c:560
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5609,7 +5956,7 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5628,52 +5975,52 @@ msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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 eraldi-allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' j�tsin vahele: duplikaat\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "`%s' j�tsin vahele: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5733,51 +6080,51 @@ msgstr "viga lugemisel: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync eba�nnestus: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaktsioon on liiga suur\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versioonikirje loomine ei �nnestu: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: loodi vigane usalduse andmebaas\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
@@ -5786,78 +6133,78 @@ msgstr "%s: trustdb on loodud\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "M�RKUS: trustdb pole kirjutatav\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 
@@ -5866,7 +6213,7 @@ msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "sisendrida on pikem, kui %d s�mbolit\n"
@@ -6034,7 +6381,7 @@ msgstr ""
 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:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6044,343 +6391,1599 @@ msgstr ""
 "Palun pidage meeles, et allkirja fail (.sig v�i .asc)\n"
 "peab olema k�sureal esimene fail.\n"
 
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "�ldine viga"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "tundmatu paketi t��p"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "tundmatu versioon"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "faili ei �nnestu avada: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "tundmatu avaliku v�tme algoritm"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "pakendamine eba�nnestus: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "tundmatu l�hendi algoritm"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "halb avalik v�ti"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "halb salajane v�ti"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "halb allkiri"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "kontrollsumma viga"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "halb parool"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "ei leia avalikku v�tit"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "tundmatu �ifri algoritm"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "v�tmehoidlat ei �nnestu avada"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "vigane pakett"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "vigane pakend"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "sellist kasutaja id pole"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "salajane v�ti ei ole k�ttesaadav"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "kasutati valet salajast v�tit"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "ei ole toetatud"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "halb v�ti"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "viga faili lugemisel"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "viga faili kirjutamisel"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "tundmatu pakkimisalgoritm"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "viga faili avamisel"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "viga faili loomisel"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "vigane parool"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "realiseerimata avaliku v�tme algoritm"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "realiseerimata �ifri algoritm"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "viga parooli loomisel: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "tundmatu allkirja klass"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "usalduse andmebaasi viga"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "halb MPI"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' on juba pakitud\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "ressursi limiit"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "vigane v�tmehoidla"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "genereeri uus v�tmepaar"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "halb sertifikaat"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "vigane kasutaja id"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "viga faili sulgemisel"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "viga faili �mber nimetamisel"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "viga faili kustutamisel"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "ootamatud andmed"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "ajatemplite konflikt"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "mittekasutatav avaliku v�tme algoritm"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "fail on olemas"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "n�rk v�ti"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "vigane argument"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "halb URI"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "mittetoetatud URI"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "v�rgu viga"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "ei leia OpenPGP andmeid.\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "kr�ptimata"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "ei t��deldud"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "loen v�tmeid failist `%s'\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "mittekasutatav avalik v�ti"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "mittekasutatav salajane v�ti"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "v�tmeserveri viga"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "Katkesta"
+msgid "do not use the internal CCID driver"
+msgstr "�ra kasuta terminali"
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "kr�ptimata"
+msgid "allow the use of admin card commands"
+msgstr "vastuolulised k�sud\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "allkirjastatud andmeid pole\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... see on viga (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "te leidsite vea ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "jah"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "jJ"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "`%s' ei �nnestu avada: %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "kirjutan salajase v�tme faili `%s'\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "M�RKUS: v�ti on t�histatud"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "halb sertifikaat"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "V�tme leiate: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "genereeri t�histamise sertifikaat"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "See v�ti on aegunud!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "n�ita s�rmej�lge"
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "kontrolli allkirja"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "ei"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "eE"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "tundmatu"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "viga: vigane s�rmej�lg\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "viga: vigane s�rmej�lg\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Te vajate kasutaja salajase v�tme lahtilukustamiseks parooli:\n"
+"\"%.*s\"\n"
+"%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "vigane r�sialgoritm `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Selline e-posti aadress ei ole lubatud\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "V�tme genereerimine eba�nnestus: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "v�tit '%s' ei leitud: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "viga v�tmebloki lugemisel: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "T�histamise sertifikaat on loodud.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "eelistus %c%lu on duplikaat\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(Kirjeldust ei antud)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "kirjutan faili `%s'\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[fail]|loo allkiri"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[fail]|loo avateksti allkiri"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "n�ita salajasi v�tmeid"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "halb sertifikaat"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "eemalda v�tmed avalike v�tmete hoidlast"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "halb sertifikaat"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "halb sertifikaat"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "muuda parooli"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "loo ascii pakendis v�ljund"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NIMI|kasuta NIME vaikimisi saajana"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "�ra kasuta terminali"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "kasuta v3 allkirju"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "kr�ptimisel kasuta alati MDC"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "pakettmood: �ra k�si kunagi"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "eelda enamus k�simustele jah vastust"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "eelda enamus k�simustele ei vastust"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "lisa see salajaste v�tmete hoidla nimekirja"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|kasuta seda v�tmeserverit"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NIMI|terminali kooditabel on NIMI"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|kasuta pakkimisalgoritmi N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"S�ntaks: gpg [v�tmed] [failid]\n"
+"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
+"vaikimisi operatsioon s�ltub sisendandmetest\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "kasuta: gpg [v�tmed] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "kirjutan faili `%s'\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "`%s' ei �nnestu sulgeda: %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "T��deldud kokku: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "genereeri t�histamise sertifikaat"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "v�tmehoidla `%s' on loodud\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "viga: vigane s�rmej�lg\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Allkiri aegus %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Korrektne allkiri kasutajalt \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                 ka \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "v�lju"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "vV"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "HOIATUS: kasutan ebaturvalist m�lu!\n"
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n"
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "rida on liiga pikk\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "allkirjastamine eba�nnestus: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "kasuta: gpg [v�tmed] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "ei leia avalikku v�tit"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@K�sud:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "lahtikr�pteerimine �nnestus\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "lahtikr�pteerimine �nnestus\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [failinimi]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s ja %s ei ole koos lubatud!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "faili ei �nnestu avada: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "%s ei �nnestu avada: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "%s ei �nnestu luua: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "%s ei �nnestu luua: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "uuendamine eba�nnestus: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "uuendamine eba�nnestus: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "uuendamine eba�nnestus: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "uuendamine eba�nnestus: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "`%s' ei �nnestu luua: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "`%s' ei �nnestu luua: %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+
+#, fuzzy
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "entroopia kogumise moodul puudub\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "`%s' ei �nnestu avada\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "kirjutan salajase v�tme faili `%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "m�rkus: random_seed fail on t�hi\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "`%s' ei �nnestu lugeda: %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "m�rkus: random_seed faili ei uuendatud\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "`%s' ei �nnestu kirjutada: %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "`%s' ei �nnestu sulgeda: %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
 
 #~ 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"
+#~ "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 ""
+#~ "Juhuarvude generaator on ainult t�hi kest, et programmid\n"
+#~ "k�iks - see EI OLE tugev juhuarvude generaator!\n"
+#~ "\n"
+#~ "�RGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
+#~ "\n"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "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 ""
-#~ "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
-#~ "ning l�pus peab olema '='\n"
+#~ "Palun oodake, kogutakse entroopiat. Igavuse v�ltimiseks v�ite teha "
+#~ "arvutiga\n"
+#~ "mingit t��d, see t�stab ka entroopia kvaliteeti.\n"
+
+#~ 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"
+#~ "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
+#~ "et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "salajane v�ti ei ole k�ttesaadav"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
+
+#~ msgid "general error"
+#~ msgstr "�ldine viga"
+
+#~ msgid "unknown packet type"
+#~ msgstr "tundmatu paketi t��p"
+
+#~ msgid "unknown version"
+#~ msgstr "tundmatu versioon"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "tundmatu avaliku v�tme algoritm"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "tundmatu l�hendi algoritm"
+
+#~ msgid "bad public key"
+#~ msgstr "halb avalik v�ti"
+
+#~ msgid "bad secret key"
+#~ msgstr "halb salajane v�ti"
+
+#~ msgid "bad signature"
+#~ msgstr "halb allkiri"
+
+#~ msgid "checksum error"
+#~ msgstr "kontrollsumma viga"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "tundmatu �ifri algoritm"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "v�tmehoidlat ei �nnestu avada"
+
+#~ msgid "invalid packet"
+#~ msgstr "vigane pakett"
+
+#~ msgid "invalid armor"
+#~ msgstr "vigane pakend"
+
+#~ msgid "no such user id"
+#~ msgstr "sellist kasutaja id pole"
+
+#~ msgid "secret key not available"
+#~ msgstr "salajane v�ti ei ole k�ttesaadav"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "kasutati valet salajast v�tit"
+
+#~ msgid "not supported"
+#~ msgstr "ei ole toetatud"
+
+#~ msgid "bad key"
+#~ msgstr "halb v�ti"
+
+#~ msgid "file read error"
+#~ msgstr "viga faili lugemisel"
+
+#~ msgid "file write error"
+#~ msgstr "viga faili kirjutamisel"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "tundmatu pakkimisalgoritm"
+
+#~ msgid "file open error"
+#~ msgstr "viga faili avamisel"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
+#~ msgid "file create error"
+#~ msgstr "viga faili loomisel"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
+#~ msgid "invalid passphrase"
+#~ msgstr "vigane parool"
 
-#~ msgid "not human readable"
-#~ msgstr "pole inimese poolt loetav"
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "realiseerimata avaliku v�tme algoritm"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "realiseerimata �ifri algoritm"
+
+#~ msgid "unknown signature class"
+#~ msgstr "tundmatu allkirja klass"
+
+#~ msgid "trust database error"
+#~ msgstr "usalduse andmebaasi viga"
+
+#~ msgid "resource limit"
+#~ msgstr "ressursi limiit"
+
+#~ msgid "invalid keyring"
+#~ msgstr "vigane v�tmehoidla"
+
+#~ msgid "malformed user id"
+#~ msgstr "vigane kasutaja id"
+
+#~ msgid "file close error"
+#~ msgstr "viga faili sulgemisel"
+
+#~ msgid "file rename error"
+#~ msgstr "viga faili �mber nimetamisel"
+
+#~ msgid "file delete error"
+#~ msgstr "viga faili kustutamisel"
+
+#~ msgid "unexpected data"
+#~ msgstr "ootamatud andmed"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "ajatemplite konflikt"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "mittekasutatav avaliku v�tme algoritm"
+
+#~ msgid "file exists"
+#~ msgstr "fail on olemas"
+
+#~ msgid "weak key"
+#~ msgstr "n�rk v�ti"
+
+#~ msgid "invalid argument"
+#~ msgstr "vigane argument"
+
+#~ msgid "bad URI"
+#~ msgstr "halb URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "mittetoetatud URI"
+
+#~ msgid "network error"
+#~ msgstr "v�rgu viga"
+
+#~ msgid "not encrypted"
+#~ msgstr "kr�ptimata"
+
+#~ msgid "not processed"
+#~ msgstr "ei t��deldud"
+
+#~ msgid "unusable public key"
+#~ msgstr "mittekasutatav avalik v�ti"
+
+#~ msgid "unusable secret key"
+#~ msgstr "mittekasutatav salajane v�ti"
+
+#~ msgid "keyserver error"
+#~ msgstr "v�tmeserveri viga"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "kr�ptimata"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "allkirjastatud andmeid pole\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... see on viga (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "HOIATUS: kasutan ebaturvalist m�lu!\n"
+
+#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#~ msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
+
+#~ msgid ""
+#~ "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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6418,10 +8021,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "viga parooli loomisel: %s\n"
-
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "halb parool v�i tundmatu �ifri algoritm (%d)\n"
 
@@ -6434,18 +8033,9 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "agendiga suhtlemiseks ei �nnestu saada kirjutamise FD\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "probleem gpg-agent programmiga suhtlemisel\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "liiga pikk parool\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "vigane vastus agendilt\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "probleem agendiga: agent tagastas 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "vali sekundaarne v�ti N"
 
@@ -6690,20 +8280,9 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgstr ""
 #~ "see �ifri algoritm ei ole soovitatav; kasutage palun m�nd standardsemat!\n"
 
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "kirjutan faili `%s'\n"
-
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "vabandust, seda ei saa pakettmoodis teha\n"
 
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "v�tit '%s' ei leitud: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "`%s' ei �nnestu luua: %s\n"
-
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "faili ei �nnestu avada: %s\n"
@@ -6749,9 +8328,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: HOIATUS: t�hi fail\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "%s ei �nnestu avada: %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
 #~ msgstr " %d = Usaldan v�hesel m��ral\n"
@@ -6788,9 +8364,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: ei �nnestu luua: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: kataloogi ei �nnestu luua: %s\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr ""
 #~ "Kui te ikkagi soovite kasutada seda kehtetut v�tit, vastake \"jah\"."
@@ -6798,9 +8371,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "Fotot \"%s\" ei �nnestu avada: %s\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "faili ei �nnestu avada: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "viga: puudub koolon\n"
 
@@ -6816,9 +8386,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- leitud v�ltsitud t�histamine\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [aegub: %s]"
@@ -6830,9 +8397,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "[t�histatud] "
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "%s ei �nnestu luua: %s\n"
-
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
@@ -6872,18 +8436,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ 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"
 
@@ -6893,48 +8445,18 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ 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 "|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 "|[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"
 
@@ -6954,15 +8476,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ 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"
 
@@ -7012,9 +8525,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgid "can't get key from keyserver: %s\n"
 #~ msgstr "v�tmeserverist ei saa v�tit: %s\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"
 
diff --git a/po/fi.po b/po/fi.po
index 3518d2c96..8fac1f9cf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -21,8 +21,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -30,299 +30,723 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: agent/call-pinentry.c:193
 #, 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"
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "entropian keräysmoduulia ei havaittu\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "rivi on liian pitkä\n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "tiedostoa \"%s\" ei voi avata\n"
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "salasana on liian pitkä\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Nimessä on epäkelpo merkki\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "MPI ei kelpaa"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "väärä salasana"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "väärä salasana"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: cipher/random.c:458
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "tiedoston \"%s\" tilaa ei voi lukea: %s\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
+
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
+
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
+
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
+
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "\"%s\" on erikoistiedosto - ohitettiin\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "huom: random_seed-tiedosto on tyhjä\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
+#: agent/divert-scd.c:217
+msgid "Admin PIN"
 msgstr ""
-"VAROITUS: random_seed-tiedosto on väärän kokoinen - tiedostoa ei käytetä\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Toista salasana: "
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: agent/divert-scd.c:290
 #, c-format
-msgid "can't create `%s': %s\n"
-msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr ""
 
-#: cipher/random.c:556 cipher/random.c:566
-#, c-format
-msgid "can't write `%s': %s\n"
-msgstr "tiedostoon \"%s\" ei voi kirjoittaa: %s\n"
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Tarvitset salasanan suojaamaan salaista avaintasi.\n"
+"\n"
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muuta salasanaa"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "VAROITUS: käytetty satunnaislukugeneraattori ei ole turvallinen.\n"
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "muuta salasanaa"
 
-#: cipher/random.c:815
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\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"
+"@\n"
+"Valitsimet:\n"
+" "
 
-#: cipher/rndegd.c:202
-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"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
 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/rndlinux.c:132
-#, 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"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
 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"
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "monisanainen"
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "ole jonkinverran hiljaisempi"
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "avainlohkojen poisto epäonnistui: %s\n"
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "etsi avaimia avainpalvelimelta"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "päivitä luottamustietokanta"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr ""
+"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "asetustiedosto \"%s\": %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "luetaan asetukset tiedostosta \"%s\"\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "virhe luotaessa \"%s\": %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "ei voida luoda kohdetta %s: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "päivitys epäonnistui: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: hakemisto luotu\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: hakemistoa ei voi luoda: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "salaisen päivitys epäonnistui: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: ohitettu: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "virhe luettaessa avainlohkoa: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
+
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "\"%s\" on jo pakattu\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "luo uusi avainpari"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "väärä salasana"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "Peru"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "avainta \"%s\" ei löydy: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "lukuvirhe: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "avainlohkojen poisto epäonnistui: %s\n"
+msgid "Yes"
+msgstr "kyllä|kylla|joo"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Avaimen luonti epäonnistui: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "ei voi avata tiedostoa: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "virhe luotaessa \"%s\": %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[Käyttäjätunnusta ei löytynyt]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "gpg-agentin kanssa yhteysongelma\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "käyttäjän peruma\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "core-tiedostojen luontia ei voi estää: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "kyllä|kylla|joo"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "kK"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "ei"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "eE"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "lopeta|sulje"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "lLsS"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: g10/armor.c:320
 #, c-format
@@ -402,176 +826,213 @@ msgstr ""
 "viallista\n"
 "MTA:ta on käytetty\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+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/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "ei ihmisten luettavissa"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -579,207 +1040,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "salaista avainta ei löydy"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "avainlohkojen poisto epäonnistui: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr ""
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr ""
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Toista salasana: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -822,225 +1231,263 @@ msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 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:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "käytetään salakirjoitusalgoritmia %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "luetaan kohteesta \"%s\"\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, 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:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 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:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "ongelma käsiteltäessä salattua pakettia\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "etäohjelman suorittamista ei tueta\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "tämä ympäristö vaatii väliaikaistiedoston kutsuttaessa ulkoisia ohjelmia\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "ulkoisen ohjelman luonnoton päättyminen\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "ulkoista ohjelmaa ei voi suorittaa\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "ulkoisen ohjelman vastausta ei voi lukea: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "salaista avainta ei voi käyttää"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "avain %08lX: ei suojattu - ohitetaan\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, 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:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, 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:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+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:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[Käyttäjätunnusta ei löytynyt]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, 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:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr ""
+"käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
+
+#: g10/getkey.c:2659
+#, 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/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1048,128 +1495,129 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1179,51 +1627,47 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "monisanainen"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1232,7 +1676,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1251,16 +1695,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1270,7 +1714,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1278,641 +1722,578 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, 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/gpg.c:1282
+#: g10/gpg.c:1298
 #, 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/gpg.c:1285
+#: g10/gpg.c:1301
 #, 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/gpg.c:1291
+#: g10/gpg.c:1307
 #, 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/gpg.c:1294
+#: g10/gpg.c:1310
 #, 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/gpg.c:1297
+#: g10/gpg.c:1313
 #, 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/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "asetustiedosto \"%s\": %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "luetaan asetukset tiedostosta \"%s\"\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, 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/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 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/gpg.c:2988
+#: g10/gpg.c:3012
 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/gpg.c:2991
+#: g10/gpg.c:3015
 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/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, fuzzy, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, fuzzy, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 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/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, 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/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, 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/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/getkey.c:152
-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:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[Käyttäjätunnusta ei löytynyt]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, 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:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr ""
-"käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
-
-#: g10/getkey.c:2658
-#, 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/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "ole jonkinverran hiljaisempi"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "ota avaimet tästä avainrenkaasta"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1920,7 +2301,7 @@ msgstr ""
 "Käyttö: gpg [valitsimet] [tiedostot]\n"
 "Tarkista allekirjoituksia tunnetuille luotetuille avaimille\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1931,7 +2312,7 @@ msgstr ""
 "luottamusverkko eikä sillä ei ole mitään tekemistä (epäsuorasti luotujen) \n"
 "varmenneverkkojen kanssa."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1943,18 +2324,18 @@ msgstr ""
 "salainen \n"
 "pari on sinulla.  Vastaa \"kyllä\" luottaaksesi tähän avaimeen ehdoitta\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1968,7 +2349,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1979,16 +2360,16 @@ msgstr ""
 "ympäristöissä.\n"
 "Ole hyvä ja kysy tietoturva-asiantuntijaltasi ensin"
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Syötä avaimen koko"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastaa \"kyllä\" tai \" ei\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -2000,19 +2381,19 @@ msgstr ""
 "mutta sen seurauksena et saa kunnollista virheilmoitusta \n"
 "vaan järjestelmä yrittää tulkita arvon aikajaksona."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Anna avaimen haltijan nimi"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "anna vapaaehtoinen, mutta erittäin suositeltava sähköpostiosoite"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Kirjoita vapaaehtoinen huomautus"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2026,11 +2407,11 @@ msgstr ""
 "O   jatka avaimen luomista\n"
 "L   lopeta"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2101,12 +2482,12 @@ msgstr ""
 "\n"
 "Jos et tiedä mikä olisi sopiva vastaus, vastaa \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Vastaa \"kyllä\" jos haluat allekirjoittaa KAIKKI käyttäjätunnukset"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2114,11 +2495,11 @@ 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:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Vastaa \"kyllä\", jos aliavaimen voi poistaa"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2129,7 +2510,7 @@ msgstr ""
 "luottamussuhteen luomiseksi avaimeen tai johonkin toiseen tämän avaimen\n"
 "varmentamaan avaimeen."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2142,7 +2523,7 @@ msgstr ""
 "avain saattaa luoda luottamusketjun toisen, jo ennalta \n"
 "varmennetun avaimen kautta."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2150,7 +2531,7 @@ msgstr ""
 "Allekirjoitus ei ole pätevä.  Järkevintä olisi poistaa se \n"
 "avainrenkaastasi."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2164,7 +2545,7 @@ msgstr ""
 "allekirjoitus vain, jos se ei ole jostain syystä pätevä, ja \n"
 "avaimella on jo toinen allekirjoitus."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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"
@@ -2174,23 +2555,23 @@ msgstr ""
 "nykyiseen luetteloon valinnoista.  Kaikkien muutettujen\n"
 "oma-allekirjoitusten aikaleima siirretään yhdellä sekunnilla eteenpäin.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 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:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "Anna allekirjoitetun tiedoston nimi"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastaa \"kyllä\", jos tiedoston voi ylikirjoittaa"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2198,7 +2579,7 @@ msgstr ""
 "Syötä uusi tiedostonimi. Jos painat vain RETURN, käytetään\n"
 "oletustiedostoa (joka näkyy sulkeissa)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2227,7 +2608,7 @@ msgstr ""
 "      tätä normaalisti käytetään merkitsemään sähköpostiosoite "
 "vanhenneeksi.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2237,11 +2618,11 @@ msgstr ""
 "mitätöintivarmenteen.  Kirjoita lyhyesti.\n"
 "Tyhjä rivi päättää tekstin.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Ei ohjeita saatavilla"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ei ohjetta aiheesta \"%s\""
@@ -2277,499 +2658,494 @@ msgstr "salaista avainta ei voi käyttää"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ohitetaan tyypin %d lohko\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ilman käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              tuotu: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             muuttamatonta: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          uusia käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           uusia aliavaimia: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   uusia avainten mitätöintejä: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ei tuotu: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, 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:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, 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:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, 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:914
+#: g10/import.c:913
 #, 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:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainrenkaassa\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, 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:1233
+#: g10/import.c:1232
 #, 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:1276
+#: g10/import.c:1275
 #, 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:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, 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:1389
+#: g10/import.c:1388
 #, 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:1391
+#: g10/import.c:1390
 #, 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:1409
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, 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:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, 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:1618
+#: g10/import.c:1617
 #, 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:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, 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:1788
+#: g10/import.c:1787
 #, 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:1802
+#: g10/import.c:1801
 #, 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:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[mitätöinti]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 väärä allekirjoitus\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d väärää allekirjoitusta\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 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:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2782,63 +3158,63 @@ msgstr ""
 "lähteistä...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Luotan osittain\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Luotan täysin\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2847,13 +3223,13 @@ msgstr ""
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "on PGP 2.x -muodon allekirjoitus.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 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:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2862,11 +3238,11 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on vanhentunut.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2875,55 +3251,55 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 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:780
+#: g10/keyedit.c:781
 #, 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:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, 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:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Tämä avain on vanhentunut!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhenee %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 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:891
+#: g10/keyedit.c:892
 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2932,32 +3308,32 @@ msgstr ""
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
 "Jos et tiedä vastausta, syötä \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) En vastaa.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2966,100 +3342,100 @@ msgstr ""
 "Haluatko varmasti allekirjoittaa tämän avaimen\n"
 "omalla avaimellasi: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "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:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "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:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "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:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "En ole tarkistanut tätä avainta lainkaan.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen arkisesti.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen erittäin huolellisesti.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ei voi muokata avainta: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3067,11 +3443,11 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3079,206 +3455,206 @@ msgstr ""
 "Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Haluatko varmasti tehdä tämän? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3286,241 +3662,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 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:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3528,19 +3904,19 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3548,7 +3924,7 @@ 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:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3557,55 +3933,55 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3615,374 +3991,379 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 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:3397
+#: g10/keyedit.c:3398
 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:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 #, 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:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 #, fuzzy
 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, 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:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX mitätöi tämän %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, 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:4858
+#: g10/keyedit.c:4859
 #, 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:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-avainparissa on 1024 bittiä.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3998,7 +4379,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4014,40 +4395,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4055,12 +4436,12 @@ 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:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4078,44 +4459,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 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:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4126,7 +4507,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
 
@@ -4141,23 +4522,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4165,12 +4546,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4182,7 +4563,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4194,50 +4575,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4246,12 +4627,12 @@ 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:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4259,7 +4640,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4267,31 +4648,31 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "ei koskaan"
 
@@ -4319,637 +4700,610 @@ msgstr "Allekirjoitusnotaatio: "
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "     Aliavaimen sormenjälki:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROITUS: löytyi 2 tiedostoa, joissa on luottamuksellisia tietoja.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s säilyi muuttumattomana\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uusi\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Ole hyvä ja korjaa tämä mahdollinen tietoturvareikä\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "tarkistetaan avainrengasta \"%s\"\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: avainrengas luotu\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 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:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, 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:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "core-tiedostojen luontia ei voi estää: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "salausalgoritmi ei ole käytössä"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = näytä lisätietoja\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Tiedosto \"%s\" on olemassa."
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: tuntematon pääte\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Syötä uusi tiedostonimi"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "kirjoitetaan vakiotulosteeseen\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "uusi asetustiedosto \"%s\" luotu\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: hakemisto luotu\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:310
-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:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
@@ -5014,7 +5368,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Toista salasana: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5029,39 +5383,35 @@ msgstr ""
 "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:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Syötä JPEG-tiedostonimi valokuvatunnisteelle: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" ei ole JPEG-tiedosto\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Onko tämä oikein (k/E/l)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "valokuvatunnistetta ei voi näyttää!\n"
 
@@ -5350,61 +5700,56 @@ 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:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "virhe luotaessa \"%s\": %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Erillinen allekirjoitus.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Anna datatiedoston nimi: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "luetaan vakiosyötettä ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "ei allekirjoitettua dataa\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, 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:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, nimetön vastaanottaja olet sinä.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vanhaa DEK-koodaus ei tueta\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, 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:302
+#: g10/pubkey-enc.c:305
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
@@ -5528,89 +5873,89 @@ msgstr "(Kuvausta ei annettu)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Kelpaako tämä? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, 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:72
+#: g10/seckey-cert.c:74
 #, 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:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Salasana ei kelpaa; yritä uudestaan"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROITUS: Havaittiin heikko avain -  vaihda salasanaa uudestaan.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "luodaan paheksuttava 16-bittinen tarkistussumma salaisen avaimen suojaksi\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "luotu avain on heikko - yritän uudestaan\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, 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:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, 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:113
+#: g10/sig-check.c:119
 #, 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:181
+#: g10/sig-check.c:191
 #, 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:182
+#: g10/sig-check.c:192
 #, 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:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5618,7 +5963,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5626,57 +5971,57 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, 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:544
+#: g10/sig-check.c:560
 #, 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:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5684,7 +6029,7 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5703,55 +6048,55 @@ msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 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:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ohitetaan \"%s\": kopio\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5811,51 +6156,51 @@ msgstr "lukuvirhe: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "trustdb-tapahtuma on liian suuri\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: hakemistoa ei ole olemassa!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versiotietueen luonti epäonnistui: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: luotu trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb luotu\n"
@@ -5864,78 +6209,78 @@ msgstr "%s: trustdb luotu\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb-tiedosto\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiotietue tietuenumerolla %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: tiedostoversio %d ei kelpaa\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
 
@@ -5944,7 +6289,7 @@ msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
 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:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "syöterivi on yli %d merkkiä pitkä\n"
@@ -6113,7 +6458,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6123,344 +6468,1603 @@ msgstr ""
 "Muista, että allekirjoitustiedosto (.sig tai .asc)\n"
 "tulee antaa komentorivillä ensimmäisenä.\n"
 
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "yleinen virhe"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "tuntematon pakettityyppi"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "tuntematon versio"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "ei voi avata tiedostoa: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "tuntematon julkisen avaimen algoritmi"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "tuntematon tiivistealgoritmi"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "julkinen avain ei kelpaa"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "salainen avain ei kelpaa"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr ""
+"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "allekirjoitus ei täsmää"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "tarkistussumma ei täsmää"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "väärä salasana"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "julkista avainta ei löydy"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "tuntematon salausalgoritmi"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "avainrenkaan avaaminen ei onnistu"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "virheellinen paketti"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "virheellinen ascii-koodaus"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "käyttäjätunnusta ei löydy"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "salaista avainta ei löydy"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "käytetty salainen avain on väärä"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "ei tuettu"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "avain ei kelpaa"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "virhe tiedostoa luettaessa"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "virhe tiedostoon kirjoitettaessa"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "tuntematon pakkausalgoritmi"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "virhe tiedostoa avattaessa"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "virhe tiedostoa luotaessa"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "väärä salasana"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "julkisen avaimen algoritmi ei ole käytössä"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "salausalgoritmi ei ole käytössä"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "tuntematon allekirjoitusluokka"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "luottamustietokantavirhe"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "MPI ei kelpaa"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "\"%s\" on jo pakattu\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "resurssiraja"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "virheellinen avainrengas"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "luo uusi avainpari"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "virheellinen varmenne"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "väärin muotoiltu käyttäjätunnus"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "virhe tiedostoa suljettaessa"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "virhe nimettäessä tiedostoa uudelleen"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "virhe tiedostoa poistettaessa"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "odottamatonta dataa"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "aikaleima ei täsmää"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "käyttökelvoton julkisen avaimen algoritmi"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "tiedosto on olemassa"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "heikko avain"
+# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "virheellinen argumentti"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "URI ei kelpaa"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "URI-muotoa ei tueta"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "verkkovirhe"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "salaamaton"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "ei käsitelty"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "julkista avainta ei voi käyttää"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "salaista avainta ei voi käyttää"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "avainpalvelinvirhe"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "Peru"
+msgid "do not use the internal CCID driver"
+msgstr "älä käytä lainkaan päätettä"
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "salaamaton"
+msgid "allow the use of admin card commands"
+msgstr "ristiriitainen komento\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "ei allekirjoitettua dataa\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "...tämä on ohjelmistovika (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "kyllä|kylla|joo"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "kK"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "HUOM: avain on mitätöity!"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "virheellinen varmenne"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Avain saatavilla kohteessa: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "luo mitätöintivarmenne"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Tämä avain on vanhentunut!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "näytä sormenjälki"
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "tarkista allekirjoitus"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "ei"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "eE"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "tuntematon "
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "virhe: sormenjälki on väärä\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "virhe: sormenjälki on väärä\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle:\n"
+"\"%.*s\"\n"
+"%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Sähköpostiosoite ei kelpaa\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Avaimen luonti epäonnistui: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "avainta \"%s\" ei löydy: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "virhe luettaessa avainlohkoa: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "Mitätöintivarmenne luotu.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "valinta %c%lu on kopio\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(Kuvausta ei annettu)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[tiedosto]|tee allekirjoitus"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "näytä salaiset avaimet"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "virheellinen varmenne"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "poista avaimet julkisten avainten renkaasta"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "virheellinen varmenne"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "virheellinen varmenne"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "muuta salasanaa"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "tuota ascii-koodattu tuloste"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "käytä oletusavainta oletusvastaanottajana"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "älä käytä lainkaan päätettä"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "käytä aina v3-allekirjoituksia"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "käytä aina MDC:tä salaamiseen"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "eräajo: älä kysy mitään"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "lisää tämä salainen avainrengas luetteloon"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NIMI|käytä salausalgoritmia NIMI"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|käytä pakkausalgoritmia N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\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"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "käyttö: gpg [valitsimet] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Kaikkiaan käsitelty: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "luo mitätöintivarmenne"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "avainrengas \"%s\" luotu\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "virhe: sormenjälki on väärä\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Allekirjoitus vanheni %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Allekirjoitus täsmää lähettäjään \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                aka \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "lopeta|sulje"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "lLsS"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "rivi on liian pitkä\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "allekirjoitus epäonnistui: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "VAROITUS: käytetään suojaamatonta muistia!\n"
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "käyttö: gpg [valitsimet] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "julkista avainta ei löydy"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Komennot:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "avaus onnistui\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "avaus onnistui\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [tiedostonimi]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "lisätietoja osoitteesta http://www.gnupg.org/faq.html\n"
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: util/secmem.c:352
-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"
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "ei voi avata tiedostoa: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "tiedostoa %s ei voi avata: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "etäohjelman suorittamista ei tueta\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "ei voida luoda kohdetta %s: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "ei voida luoda kohdetta %s: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "päivitys epäonnistui: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "päivitys epäonnistui: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "päivitys epäonnistui: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "päivitys epäonnistui: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
+
+#, fuzzy
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "entropian keräysmoduulia ei havaittu\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "tiedostoa \"%s\" ei voi avata\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "tiedoston \"%s\" tilaa ei voi lukea: %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "\"%s\" on erikoistiedosto - ohitettiin\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "huom: random_seed-tiedosto on tyhjä\n"
+
+#~ 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"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "tiedostoon \"%s\" ei voi kirjoittaa: %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "VAROITUS: käytetty satunnaislukugeneraattori ei ole turvallinen.\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "lue lisätietoja osoitteesta http://www.gnupg.org/why-not-idea.html\n"
+#~ "Satunnaislukugeneraattori on pelkkä kulissi, joka mahdollistaa\n"
+#~ "ohjelman ajamisen - se ei ole vahvasti satunnainen!\n"
+#~ "\n"
+#~ "ÄLÄ KÄYTÄ OHJELMAN TUOTTAMAA DATAA!!\n"
+
+#~ 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"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "\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 ""
-#~ "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
-#~ "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
+#~ "\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"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "salaista avainta ei löydy"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
+#~ msgid "general error"
+#~ msgstr "yleinen virhe"
 
-#~ msgid "not human readable"
-#~ msgstr "ei ihmisten luettavissa"
+#~ msgid "unknown packet type"
+#~ msgstr "tuntematon pakettityyppi"
+
+#~ msgid "unknown version"
+#~ msgstr "tuntematon versio"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "tuntematon julkisen avaimen algoritmi"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "tuntematon tiivistealgoritmi"
+
+#~ msgid "bad public key"
+#~ msgstr "julkinen avain ei kelpaa"
+
+#~ msgid "bad secret key"
+#~ msgstr "salainen avain ei kelpaa"
+
+#~ msgid "bad signature"
+#~ msgstr "allekirjoitus ei täsmää"
+
+#~ msgid "checksum error"
+#~ msgstr "tarkistussumma ei täsmää"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "tuntematon salausalgoritmi"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "avainrenkaan avaaminen ei onnistu"
+
+#~ msgid "invalid packet"
+#~ msgstr "virheellinen paketti"
+
+#~ msgid "invalid armor"
+#~ msgstr "virheellinen ascii-koodaus"
+
+#~ msgid "no such user id"
+#~ msgstr "käyttäjätunnusta ei löydy"
+
+#~ msgid "secret key not available"
+#~ msgstr "salaista avainta ei löydy"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "käytetty salainen avain on väärä"
+
+#~ msgid "not supported"
+#~ msgstr "ei tuettu"
+
+#~ msgid "bad key"
+#~ msgstr "avain ei kelpaa"
+
+#~ msgid "file read error"
+#~ msgstr "virhe tiedostoa luettaessa"
+
+#~ msgid "file write error"
+#~ msgstr "virhe tiedostoon kirjoitettaessa"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "tuntematon pakkausalgoritmi"
+
+#~ msgid "file open error"
+#~ msgstr "virhe tiedostoa avattaessa"
+
+#~ msgid "file create error"
+#~ msgstr "virhe tiedostoa luotaessa"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "väärä salasana"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "julkisen avaimen algoritmi ei ole käytössä"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "salausalgoritmi ei ole käytössä"
+
+#~ msgid "unknown signature class"
+#~ msgstr "tuntematon allekirjoitusluokka"
+
+#~ msgid "trust database error"
+#~ msgstr "luottamustietokantavirhe"
+
+#~ msgid "resource limit"
+#~ msgstr "resurssiraja"
+
+#~ msgid "invalid keyring"
+#~ msgstr "virheellinen avainrengas"
+
+#~ msgid "malformed user id"
+#~ msgstr "väärin muotoiltu käyttäjätunnus"
+
+#~ msgid "file close error"
+#~ msgstr "virhe tiedostoa suljettaessa"
+
+#~ msgid "file rename error"
+#~ msgstr "virhe nimettäessä tiedostoa uudelleen"
+
+#~ msgid "file delete error"
+#~ msgstr "virhe tiedostoa poistettaessa"
+
+#~ msgid "unexpected data"
+#~ msgstr "odottamatonta dataa"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "aikaleima ei täsmää"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "käyttökelvoton julkisen avaimen algoritmi"
+
+#~ msgid "file exists"
+#~ msgstr "tiedosto on olemassa"
+
+#~ msgid "weak key"
+#~ msgstr "heikko avain"
+
+#~ msgid "invalid argument"
+#~ msgstr "virheellinen argumentti"
+
+#~ msgid "bad URI"
+#~ msgstr "URI ei kelpaa"
+
+#~ msgid "unsupported URI"
+#~ msgstr "URI-muotoa ei tueta"
+
+#~ msgid "network error"
+#~ msgstr "verkkovirhe"
+
+#~ msgid "not encrypted"
+#~ msgstr "salaamaton"
+
+#~ msgid "not processed"
+#~ msgstr "ei käsitelty"
+
+#~ msgid "unusable public key"
+#~ msgstr "julkista avainta ei voi käyttää"
+
+#~ msgid "unusable secret key"
+#~ msgstr "salaista avainta ei voi käyttää"
+
+#~ msgid "keyserver error"
+#~ msgstr "avainpalvelinvirhe"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "salaamaton"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "ei allekirjoitettua dataa\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "...tämä on ohjelmistovika (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "VAROITUS: käytetään suojaamatonta muistia!\n"
+
+#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#~ msgstr "lisätietoja osoitteesta http://www.gnupg.org/faq.html\n"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
+
+#~ 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"
+
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6498,10 +8102,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "virhe luotaessa salasanaa: %s\n"
-
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "väärä salasana tai tuntematon salausalgoritmi (%d)\n"
 
@@ -6514,18 +8114,9 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "palvelin ei kirjoita agentille FD:tä\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "gpg-agentin kanssa yhteysongelma\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "salasana on liian pitkä\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "agentin lähettämä vastaus ei kelpaa\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "valitse toissijainen avain N"
 
@@ -6772,20 +8363,9 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ "tämän salausalgoritmin käyttöä paheksutaan; ole hyvä ja käytä "
 #~ "standardimpaa!\n"
 
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "kirjoitetaan kohteeseen \"%s\"\n"
-
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "valitan, tätä ei voi tehdä eräajossa\n"
 
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "avainta \"%s\" ei löydy: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
-
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "ei voi avata tiedostoa: %s\n"
@@ -6831,9 +8411,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: VAROITUS: tiedosto on tyhjä\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "tiedostoa %s ei voi avata: %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
 #~ msgstr " %d = Luotan osittain\n"
@@ -6870,9 +8447,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: ei voi luoda: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: hakemistoa ei voi luoda: %s\n"
-
 #~ 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ä "
@@ -6881,9 +8455,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "Valokuvaa \"%s\" ei voi avata: %s\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "ei voi avata tiedostoa: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "virhe: kaksoispiste puuttuu\n"
 
@@ -6899,9 +8470,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- väärennetty mitätöinti löydetty\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [vanhenee: %s]"
@@ -6913,9 +8481,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "[mitätöity] "
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "ei voida luoda kohdetta %s: %s\n"
-
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
@@ -6955,18 +8520,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ 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"
 
@@ -6976,48 +8529,18 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ 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 "|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 "|[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"
 
@@ -7038,15 +8561,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ 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"
 
@@ -7098,9 +8612,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\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"
 
diff --git a/po/fr.po b/po/fr.po
index 6c0812c05..c208cd229 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -19,303 +19,736 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "impossible de g�n�rer un nombre premier avec pbits=%u qbits=%u\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "impossible de verrouiller `%s'\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "ligne trop longue"
+
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "ligne trop longue"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Caract�re invalide dans le nom\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "mauvais entier en pr�cision multiple (MPI)"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "mauvaise phrase de passe"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "mauvaise phrase de passe"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "�criture de la cl� secr�te dans `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "impossible de cr�er `%s': %s\n"
+
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "impossible d'acc�der � `%s': %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' n'est pas un fichier r�gulier - ignor�\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "note: le fichier `random_seed' est vide\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr ""
+"erreur durant la lecture des informations contenues actuellement\n"
+"dans la cl�: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
 msgstr ""
-"AVERTISSEMENT: la taille du fichier `random_seed' est invalide.\n"
-"Celui-ci ne sera pas utilis�.\n"
+"aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "impossible de lire `%s': %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "impossible de cr�er `%s': %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "impossible d'�crire `%s': %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "impossible de fermer `%s': %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
+
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "|A|code PIN d'administration"
+
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "R�p�tez ce code PIN: "
+
+#: agent/divert-scd.c:278
+msgid "PIN not correctly repeated; try again"
+msgstr "le code PIN n'a pas �t� correctement r�p�t� ; recommencez"
+
+#: agent/divert-scd.c:290
+#, fuzzy, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Vous avez besoin d'une phrase de passe pour prot�ger votre cl�\n"
+"secr�te.\n"
+"\n"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "changer la phrase de passe"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 msgstr ""
-"ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
 
-#: cipher/random.c:815
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "changer la phrase de passe"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
 msgstr ""
-"Le g�n�rateur de nombres al�atoires n'est qu'un artifice visant � ex�cuter\n"
-"GnuPG - ce n'est en aucune mani�re un g�n�rateur (RNG) fort!\n"
-"\n"
-"N'UTILISEZ PAS LES DONN�ES G�N�R�ES PAR CE PROGRAMME !!\n"
-"\n"
 
-#: cipher/rndegd.c:202
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "bavard"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "devenir beaucoup plus silencieux"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "lire les options de `%s'\n"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "chercher les cl�s avec un serveur de cl�s"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr ""
+"indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
+"s�lectionn�"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "mettre la base de confiance � jour"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr ""
+"Signaler toutes anomalies � <[email protected]> (en anglais)\n"
+"et tout probl�me de traduction � <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\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/rndlinux.c:132
+#: agent/gpg-agent.c:300
 #, 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"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
-"\n"
-"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/app-openpgp.c:596
+#: agent/gpg-agent.c:303
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "impossible de stocker l'empreinte: %s\n"
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:609
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
 #, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "impossible de stocker la date de cr�ation: %s\n"
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
 
-#: g10/app-openpgp.c:977
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
 #, c-format
-msgid "reading public key failed: %s\n"
-msgstr "la lecture de la cl� publique a �chou�: %s\n"
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
-msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
-msgstr "la r�ponse ne contient pas le modulo RSA\n"
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "fichier d'options `%s': %s\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
-msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "lire les options de `%s'\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "l'appel du PIN a retourn� une erreur: %s\n"
+msgid "error creating `%s': %s\n"
+msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
-"Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
-"est %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "impossible de cr�er `%s': %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr ""
+"erreur pendant la recherche de l'enregistrement de confiance\n"
+"dans `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "la mise � jour a �chou�: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "�criture de la cl� secr�te dans `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
 #, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "la v�rification CHV%d a �chou�: %s\n"
+msgid "directory `%s' created\n"
+msgstr "r�pertoire `%s' cr��\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
-msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
-msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
-msgstr "la carte est irr�m�diablement bloqu�e !\n"
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1432
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
-"%d tentatives de PIN admin restent jusqu'� ce que la carte\n"
-"soit irr�m�diablement bloqu�e\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
-msgstr "|A|code PIN d'administration"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
-msgstr "|AN|Nouveau code PIN d'administration"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
-msgstr "|N|Nouveau code PIN"
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, fuzzy, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: ignor�: %s\n"
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1650
+#, fuzzy
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent n'est pas disponible dans cette session\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
-msgid "error reading application data\n"
-msgstr "erreur pendant la lecture de donn�es d'application\n"
+#: agent/preset-passphrase.c:100
+#, fuzzy
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
-msgid "error reading fingerprint DO\n"
-msgstr "erreur pendant la lecture de l'empreinte DO\n"
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
-msgid "key already exists\n"
-msgstr "la cl� existe d�j�\n"
+#: agent/protect-tool.c:146
+#, fuzzy
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
-msgstr "la cl� existante sera remplac�e\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1568
-msgid "generating new key\n"
-msgstr "g�n�rer une nouvelle cl�\n"
+#: agent/protect-tool.c:1206
+#, fuzzy
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
-msgstr "l'horodatage de cr�ation est manquant\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+msgstr ""
+
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "mauvaise phrase de passe"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "annul�"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "erreur dans `%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "fichier d'options `%s': %s\n"
 
-#: g10/app-openpgp.c:1742
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "erreur de lecture dans `%s': %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "l'exposant public RSA est manquant ou trop �lev� (plus de %d bits)\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
-"le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n"
-"%d bits\n"
 
-#: g10/app-openpgp.c:1827
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
 #, c-format
-msgid "failed to store the key: %s\n"
-msgstr "le stockage de la cl� a �chou�: %s\n"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
-msgstr "attendez que la cl� se g�n�re...\n"
+#: agent/trustlist.c:453
+#, fuzzy
+msgid "Yes"
+msgstr "oui"
 
-#: g10/app-openpgp.c:1901
-msgid "generating key failed\n"
-msgstr "la g�n�ration de la cl� a �chou�\n"
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
+#, fuzzy, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
+
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "la g�n�ration de cl� a �t� effectu�e (%d secondes)\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
+#: common/exechelp.c:446
+#, fuzzy, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr ""
+"erreur durant la lecture des informations contenues actuellement\n"
+"dans la cl�: %s\n"
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:452 common/exechelp.c:492
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "signature %s, algorithme de hachage %s\n"
+msgid "error running `%s': exit status %d\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "signatures cr��es jusqu'ici: %lu\n"
+msgid "error running `%s': probably not installed\n"
+msgstr ""
+
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "erreur pendant la cr�ation de `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[Nom utilisateur introuvable]"
 
-#: g10/app-openpgp.c:2142
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent n'est pas disponible dans cette session\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr ""
+
+#: common/simple-pwquery.c:389
+msgid "problem setting the gpg-agent options\n"
 msgstr ""
-"la v�rification du code PIN d'administration est actuellement interdite\n"
-"au travers de cette commande\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "annul� par l'utilisateur\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
 #, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
+msgid "can't disable core dumps: %s\n"
+msgstr "impossible d'emp�cher la g�n�ration de fichiers �core�: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr ""
+"AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
+"s�r\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr ""
+"AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
+"peu s�res\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "oui"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "oO"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "non"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "quitter"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr "ok|ok"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr "annuler|annuler"
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:115
+msgid "cC"
+msgstr "aA"
 
 #: g10/armor.c:320
 #, c-format
@@ -392,167 +825,203 @@ msgstr ""
 "caract�re cit�-imprimable (quoted-printable) dans l'armure provenant\n"
 "certainement d'un agent de transfert de messages bogu�\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+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 caract�res imprimables\n"
+"ou des espaces, et se terminer par un signe '='\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
+
+#: g10/build-packet.c:962
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "un nom de notation utilisateur ne doit pas plus d'un caract�re '@'\n"
+
+#: g10/build-packet.c:980
+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/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "illisible par un humain"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[non positionn�]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr "f�minin"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "non sp�cifi�"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr "non forc�"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr "forc�"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur: Le caract�re � < � ne peut pas �tre utilis�.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur: Les espaces doubles ne sont pas permis.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr "Nom du d�teneur de la carte: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr "Pr�nom du d�teneur de la carte: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Erreur: Nom combin� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr "URL pour r�cup�rer la cl� publique: %s"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr "Donn�es d'identification (nom du compte): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 "Erreur: Donn�es d'indentification trop longues (la limite est\n"
 "%d caract�res).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr "Donn�es DO priv�es: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Erreur: DO priv� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 msgid "Language preferences: "
 msgstr "Pr�f�rences de langue: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 msgid "Error: invalid length of preference string.\n"
 msgstr "Erreur: longueur invalide de la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Erreur: caract�res invalide dans la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexe ((M)asculin, (F)�minin ou espace): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 msgid "Error: invalid response.\n"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorit� de certification: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur: empreinte mal format�e.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "l'op�ration sur la cl� n'est pas possible: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "Remplacer la cl� existante ? (o/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Faire une sauvegarde hors carte de la cl� de chiffrement ? (O/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr "Remplacer les cl�s existantes ? (o/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -563,194 +1032,141 @@ msgstr ""
 "   PIN = `%s'     PIN admin = `%s'\n"
 "Vous devriez les changer avec la commande --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cl� de signature\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cl� de chiffrement\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "S�lectionnez l'endroit o� stocker la cl�:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "algorithme de protection de cl� inconnu\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "lister toutes les donn�es disponibles"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "changer le nom du propri�taire de la carte"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "changer l'URL pour r�cup�rer la cl�"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "aller chercher la cl� sp�cifi�e dans l'URL de la carte"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "changer le nom d'identification"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "changer les pr�f�rences de langue"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "changer le sexe du propri�taire de la carte"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "changer l'empreinte d'une autorit� de certification"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 "inverser le param�tre obligeant � rentrer le code PIN pour les\n"
 "signatures"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour changer ou d�verrouiller le PIN"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr "v�rifier le code PIN et lister toutes les donn�es"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "la cl� secr�te n'est pas disponible"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr "Ins�rez la carte et tapez entr�e ou entrez 'c' pour annuler: "
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-"Supprimez la carte pr�sente et ins�rez celle portant le num�ro de\n"
-"s�rie:\n"
-"   %.*s\n"
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr "Tapez entr�e quand vous �tes pr�t ou entrez 'c' pour annuler: "
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr "Entrez le nouveau code PIN admin: "
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr "Entrez le nouveau code PIN: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr "Entrez le code PIN admin: "
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr "Entrez le code PIN: "
-
-#: g10/cardglue.c:937
-msgid "Repeat this PIN: "
-msgstr "R�p�tez ce code PIN: "
-
-#: g10/cardglue.c:952
-msgid "PIN not correctly repeated; try again"
-msgstr "le code PIN n'a pas �t� correctement r�p�t� ; recommencez"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output n'est pas compatible avec cette commande\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -790,50 +1206,50 @@ msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 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/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 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:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "utilisation de l'algorithme de chiffrement %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -841,7 +1257,7 @@ msgstr ""
 "AVERTISSEMENT: forcer le chiffrement sym�trique %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -850,176 +1266,213 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de compression %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, 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 destinataire\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, 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/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffr� pour: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENTION: Le message a �t� chiffr� avec une cl� faible pendant le\n"
 "chiffrement sym�trique.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "probl�me de gestion des paquets chiffr�s\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "aucun programme d'ex�cution distante n'est support�\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "cette plateforme a besoin de fichiers temporaires pour appeler des\n"
 "programmes externes\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "impossible d'ex�cuter le programme `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "impossible d'ex�cuter l'int�rpr�teur de commandes `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "sortie non naturelle du programme externe\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "impossible d'ex�cuter le programme externe\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, 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:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, 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/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "aucune cl� de r�vocation trouv�e pour � %s �\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "nettoyer les parties inutilisables de la cl�"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 msgid "exporting secret keys not allowed\n"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cl� %s: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cl� %s: cl� de style PGP 2.x - ignor�e\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVERTISSEMENT: la cl� secr�te %s n'a pas de somme de contr�le SK\n"
 "simple\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
+
+#: g10/getkey.c:176
+msgid "[User ID not found]"
+msgstr "[Nom utilisateur introuvable]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+"La cl� invalide %s a �t� rendue valide par\n"
+"--allow-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
+
+#: g10/getkey.c:2612
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr ""
+"utilisation de la sous-cl� %s � la place de la cl�\n"
+"principale %s\n"
+
+#: g10/getkey.c:2659
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1027,127 +1480,128 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1157,51 +1611,47 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "bavard"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1209,7 +1659,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1229,17 +1679,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 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/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1249,7 +1699,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/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1257,85 +1707,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, 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 le r�pertoire personnel `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1343,21 +1793,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 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 l'extension `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1365,567 +1815,505 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "fichier d'options `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "lire les options de `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, 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/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2826
-#, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "NOTE: %s n'est pas disponible dans cette version\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "pas d'ex�cution ave une m�moire non s�curis�e � cause de %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 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/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 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/gpg.c:2986
+#: g10/gpg.c:3010
 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/gpg.c:2988
+#: g10/gpg.c:3012
 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
 "chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
 "--s2k-mode 0\n"
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
-
-#: g10/getkey.c:175
-msgid "[User ID not found]"
-msgstr "[Nom utilisateur introuvable]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr ""
-"La cl� invalide %s a �t� rendue valide par\n"
-"--allow-non-selfsigned-uid\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
-
-#: g10/getkey.c:2611
-#, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr ""
-"utilisation de la sous-cl� %s � la place de la cl�\n"
-"principale %s\n"
-
-#: g10/getkey.c:2658
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "devenir beaucoup plus silencieux"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 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:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Utilisation: gpgv [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1933,7 +2321,7 @@ msgstr ""
 "Syntaxe: gpg [options] [fichiers]\n"
 "Verifier des signatures avec des cl�s de confiance connues\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1944,7 +2332,7 @@ msgstr ""
 "de confiance (web-of-trust); cela n'a rien � voir avec le r�seau des\n"
 "certificats (cr�� implicitement)"
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1956,18 +2344,18 @@ 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:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1992,7 +2380,7 @@ msgstr ""
 "La premi�re cl� (cl� principale) doit toujours �tre une cl� capable\n"
 "de signer."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -2003,16 +2391,16 @@ msgstr ""
 "pour certains domaines.\n"
 "Consultez votre expert en s�curit� d'abord."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Entrez la taille de la cl�"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "R�pondez �oui� ou �non�"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -2024,19 +2412,19 @@ msgstr ""
 "mauvais - le syst�me essaierait d'interpr�ter la valeur donn�e comme un\n"
 "intervalle."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Entrez le nom du propri�taire de la cl�"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "entrez une adresse e-mail optionnelle mais hautement recommand�e"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Entrez un commentaire optionnel"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2050,11 +2438,11 @@ msgstr ""
 "O pour continuer � g�n�rer la cl�.\n"
 "Q pour arr�ter de g�n�rer de cl�."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2121,11 +2509,11 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quelle r�ponse est la bonne, r�pondez \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "R�pondez �oui� si vous voulez signer TOUS les noms d'utilisateurs"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2133,11 +2521,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:195
+#: g10/helptext.c:197
 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:200
+#: g10/helptext.c:202
 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"
@@ -2148,7 +2536,7 @@ msgstr ""
 "�tablir une connection de confiance vers la cl� ou une autre cl� certifi�e\n"
 "par celle-l�."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2160,7 +2548,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:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2168,7 +2556,7 @@ msgstr ""
 "Cette signature n'est pas valide. Vous devriez la supprimer de votre\n"
 "porte-cl�s."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2182,7 +2570,7 @@ msgstr ""
 "cette auto-signature est invalide pour une certaine raison et si une autre\n"
 "est disponible."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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"
@@ -2192,25 +2580,25 @@ 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:230
+#: g10/helptext.c:232
 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:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "R�p�tez la derni�re phrase de passe pour �tre s�r de ce que vous\n"
 "avez tap�."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 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:245
+#: g10/helptext.c:247
 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:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2218,7 +2606,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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2247,7 +2635,7 @@ msgstr ""
 "      utilis�. Cela sert g�n�ralement � indiquer qu'une adresse e-mail\n"
 "      est invalide.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2257,11 +2645,11 @@ msgstr ""
 "avez �mis ce certificat de r�vocation. Essayez de garder ce texte concis.\n"
 "Une ligne vide d�limite la fin du texte.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Pas d'aide disponible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
@@ -2297,501 +2685,496 @@ msgstr "nettoyer les parties inutilisables de la cl�"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nouvelles cl�s ignor�es: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  non import�e: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "          signatures nettoy�es: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   noms d'utilisateur nettoy�s: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, fuzzy, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr "AVERTISSEMENT: la cl� %s contient des pr�ferences pour des\n"
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "il est fortement sugg�r� de mettre � jour vos pr�f�rences et\n"
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "redistribuer cette cl� pour �viter les probl�mes potentiels qui seraient\n"
 "caus�s par des algorithmes non appropri�s\n"
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "vous pouvez mettre � jour vos pr�f�rences avec: \n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cl� %s: cl� publique non trouv�e: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, 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:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cl� %s: cl� publique � %s � import�e\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cl� %s: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cl� %s: � %s � un nouvel utilisateur\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cl� %s: � %s � une nouvelle signature\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cl� %s: � %s � %d nouvelles signatures\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cl� %s: � %s � %d nom d'utilisateur nettoy�\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cl� %s: � %s � %d noms d'utilisateur nettoy�s\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cl� %s: � %s � n'a pas chang�\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cl� %s: cl� secr�te import�e\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cl� %s: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur � %s �\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cl� %s: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cl� %s: sous-cl� non prise en compte\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
 "la cl� de r�vocation %s\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
 "r�vocation %s est absente.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTE: le num�ro de s�rie d'une cl� n'est pas celui de la carte\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTE: la cl� primaire est en ligne et stock�e sur la carte\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTE: la cl� secondaire est en ligne et stock�e sur la carte\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, 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:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "le porte-cl�s `%s` a �t� cr��\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "ressource bloc de cl�s `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 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:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 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:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, 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:357
+#: g10/keyedit.c:358
 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:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2803,17 +3186,17 @@ msgstr ""
 "v�rifier son passeport, v�rifier les empreintes de plusieurs sources\n"
 "diff�rentes, etc.)\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = je crois marginalement\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = je fais enti�rement confiance\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2823,47 +3206,47 @@ msgstr ""
 "Une profondeur sup�rieure � 1 permet � la cl� que vous signez de faire\n"
 "des signatures de confiance de votre part.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Entrez un domaine pour restreindre cette signature, ou bien appuyez\n"
 "sur la touche entr�e pour aucun domaine.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Le nom d'utilisateur \"%s\" est expir�."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, 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:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Le nom d'utilisateur \"%s\" est susceptible d'�tre sign�.  "
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2872,11 +3255,11 @@ msgstr ""
 "L'auto-signature de \"%s\"\n"
 "est de style PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2885,13 +3268,13 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "a expir�.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2900,43 +3283,43 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 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:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� localement par la cl� %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� par la cl� %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 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:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Rien � signer avec la cl� %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2944,11 +3327,11 @@ msgstr ""
 "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:891
+#: g10/keyedit.c:892
 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2958,31 +3341,31 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, 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:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, 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:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2991,92 +3374,92 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec votre cl� � %s � (%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "AVERTISSEMENT: la signature ne sera pas marqu�e comme\n"
 "non-exportable.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
 "non-r�vocable.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La cl� poss�de seulement des items partiels ou stock�s sur carte -\n"
 "pas de phrase de passe � changer.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 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:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 "Les parties secr�tes de la cl� principale sont stock�es sur la\n"
 "carte.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3085,198 +3468,198 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte de la cl�"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "select subkey N"
 msgstr "s�lectionner la sous-cl� N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 msgid "check signatures"
 msgstr "v�rifier les signatures"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s [* voir ci-dessous pour\n"
 "les commandes similaires]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 msgid "sign selected user IDs locally"
 msgstr "signer le nom d'utilisateur s�lectionn� localement"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "sign selected user IDs with a trust signature"
 msgstr "signer les noms d'utilisateurs s�lectionn�s localement"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s avec une signature\n"
 "non-r�vocable"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 msgid "delete selected user IDs"
 msgstr "enlever les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 msgid "add a subkey"
 msgstr "ajouter une sous-cl�"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr "d�placer une cl� de sauvegarde vers une carte � puce"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 msgid "delete selected subkeys"
 msgstr "enlever les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 msgid "delete signatures from the selected user IDs"
 msgstr "enlever les signatures des noms d'utilisateur s�lectionn�s "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "changer la date d'expiration de la cl� ou des sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr "marquer le nom d'utilisateur s�lectionn� comme principal"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 msgid "toggle between the secret and public key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "indiquer l'URL du serveur de cl�s pr�f�r� pour les noms d'utilisateur\n"
 "s�lectionn�s"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "changer la phrase de passe"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 msgid "revoke signatures on the selected user IDs"
 msgstr "r�voquer les signatures des noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 msgid "revoke selected user IDs"
 msgstr "r�voquer les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 msgid "revoke key or selected subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 msgid "enable key"
 msgstr "activer la cl�"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 msgid "disable key"
 msgstr "d�sactiver la cl�"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr "montrer les photos d'identit� s�lectionn�es"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, 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:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3288,158 +3671,158 @@ msgstr ""
 "(tsign), par `nr' pour les signatures non-r�vocables (nrsign), ou\n"
 "bien toute combinaison possible (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Type de signature `%s' inconnu\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Enlever r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever r�ellement la cl� principale ? (o/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez s�lectionner exactement une cl�.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr "La commande attend un nom de fichier comme argument\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Erreur durant la lecture de la cl� de sauvegarde de `%s' : %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 msgid "Really revoke this user ID? (y/N) "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer la cl� enti�re ? (o/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer les sous-cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette sous-cl� ? (o/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confiance du propri�taire peut ne pas �tre positionn�e en utilisant\n"
 "la base de confiance d'un tiers\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 msgid "Set preference list to:\n"
 msgstr "Changer la liste de pr�f�rences en :\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? (o/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 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:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3447,73 +3830,73 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Cette cl� a �t� r�voqu�e le %s par la cl� %s %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3521,17 +3904,17 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3540,7 +3923,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3550,55 +3933,55 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invalide"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3608,375 +3991,380 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 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"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une sous-cl�.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une sous-cl�.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'auto-signature v3 du nom d'utilisateur � %s � a �t� ignor�e\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notation de signature: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-cl� avec l'index %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "sign� par votre cl� %s � %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, 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:4858
+#: g10/keyedit.c:4859
 #, c-format
 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:4922
+#: g10/keyedit.c:4923
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La cl� %s est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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�\n"
 "0x%s (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "pr�f�rence `%s' dupliqu�e\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "trop de pr�f�rences de chiffrement\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "trop de pr�f�rences de hachage\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "trop de pr�f�rences de compression\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�l�ment `%s' invalide dans la cha�ne de pr�f�rences\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "�criture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr "Authentifier"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Actions possibles pour une cl� %s: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacit� de signer\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacit� de chiffrement\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacit� d'authentifier\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Termin�\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La paire de cl�s DSA fera %u bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "les cl�s %s peuvent faire entre %u et %u bits de longueur.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "les tailles de cl�s %s doivent �tre dans l'intervalle %u-%u\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3992,7 +4380,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4008,38 +4396,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La signature est valide pour ? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4047,11 +4435,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:1692
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4067,44 +4455,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 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:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4115,7 +4503,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
@@ -4131,23 +4519,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4156,12 +4544,12 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4175,7 +4563,7 @@ msgstr ""
 "� --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4187,52 +4575,52 @@ 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:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique dans `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'une cl� secr�te partielle dans `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, 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:3047
+#: g10/keygen.c:3228
 #, 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:3065
+#: g10/keygen.c:3246
 #, 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:3072
+#: g10/keygen.c:3253
 #, 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:3095
+#: g10/keygen.c:3276
 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:3106
+#: g10/keygen.c:3287
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4241,13 +4629,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une sous-cl� �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, 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:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4255,7 +4643,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:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4263,31 +4651,31 @@ 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:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "le stockage de la cl� dans la carte a �chou�: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "jamais    "
 
@@ -4315,454 +4703,454 @@ msgstr "Notation de signature: "
 msgid "Keyring"
 msgstr "Porte-cl�s"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de cl� principale:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "   Empreinte de la sous-cl�:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Empreinte de la cl� principale:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "       Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 msgid "      Key fingerprint ="
 msgstr "    Empreinte de la cl� ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr "N� de s�rie de la carte ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "renommer `%s' en `%s' a �chou�: %s \n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "mise en ant�m�moire du porte-cl�s `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire v�rifi�es pour l'instant (%lu signatures)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire (%lu signatures)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISSEMENT: les options de serveur de cl�s `%s' ne sont pas\n"
 "utilis�es dans cette plateforme\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr "d�sactiv�"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cl� � %s � introuvable dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 msgid "key not found on keyserver\n"
 msgstr "cl� non trouv�e dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requ�te de la cl� %s du serveur %s %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requ�te de la cl� %s de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "envoi de la cl� %s au serveur %s %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la cl� %s � %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de cl�s !\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISSEMENT: le gestionnaire de serveurs de cl�s provient d'une\n"
 "version diff�rente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "les appels externes � un serveur de cl� ne sont pas support�s dans\n"
 "cette compilation\n"
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "l'action `%s' n'est pas support�e avec le type de serveurs\n"
 "de cl�s `%s'\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 msgid "keyserver timed out\n"
 msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de cl�s\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafra�chissement d'une cl� depuis %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafra�chissement de %d cl�s depuis %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "taille �tonnante pour une cl� de session chiffr�e (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "cl� de session chiffr�e %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "phrase de passe g�n�r�e avec l'algorithme de hachage %d inconnu\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, c-format
 msgid "public key is %s\n"
 msgstr "la cl� publique est %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 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:472
+#: g10/mainproc.c:444
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "chiffr� avec une cl� de %u bits %s, ID %s, cr��e le %s\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      � %s �\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffr� avec une cl� %s, ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffr� avec %lu phrases de passe\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffr� avec 1 phrase de passe\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 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:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISSEMENT: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               en utilisant la cl� %s %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la cl� %s ID %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de � %s �"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expir�e de � %s �"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias � %s �"
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -4770,191 +5158,164 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
-#: g10/misc.c:122
-#, 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:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat de `%s' �chou� dans %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme exp�rimental � cl�\n"
 "publique %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme exp�rimental de chiffrement\n"
 "%s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme de hachage\n"
 "exp�rimental %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISSEMENT: l'algorithme de hachage %s est d�conseill�\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "AVERTISSEMENT: \"%s\" est une commande d�conseill�e - ne\n"
 "l'utilisez pas\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Non-compress�"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Le fichier `%s' existe. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 msgid "Overwrite? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffixe inconnu\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Entrez le nouveau nom de fichier"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "�criture vers la sortie standard\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, 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:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr " nouveau fichier de configuration `%s' cr��\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, c-format
-msgid "directory `%s' created\n"
-msgstr "r�pertoire `%s' cr��\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 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:1157
+#: g10/parse-packet.c:1211
 #, 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:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent n'est pas disponible dans cette session\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
-
-#: g10/passphrase.c:345
-#, 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/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "impossible de se connecter � `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
@@ -5019,7 +5380,7 @@ msgstr "        (sous-cl� de la cl� principale ID %s)"
 msgid "Repeat passphrase: "
 msgstr "R�p�tez la phrase de passe: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5034,38 +5395,34 @@ msgstr ""
 "en sera de m�me pour votre cl� !\n"
 "La meilleure taille � utiliser est 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Entrez le nom du fichier JPEG pour la photo d'identit�: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "impossible d'ouvrir le fichier JPEG `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Ce JPEG est vraiment tr�s grand (%d octets) !\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�tes-vous s�r de vouloir l'utiliser ? (o/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' n'est pas un fichier JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Cette photo est-elle correcte (o/N/q) ? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "impossible d'afficher la photo d'identit� !\n"
 
@@ -5350,63 +5707,58 @@ msgstr ""
 "les donn�es ne sont pas enregistr�es; utilisez l'option �--output� pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "erreur pendant la cr�ation de `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Signature d�tach�e.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, 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:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinataire anonyme; essai de la cl� secr�te %s...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le destinataire anonyme.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 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:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "AVERTISSEMENT: l'algorithme de chiffrement %s n'a pas �t� trouv�\n"
 "dans les pr�f�rences du destinataire\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTE: la cl� secr�te %s a expir� le %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
@@ -5527,94 +5879,94 @@ msgstr "(Aucune description donn�e)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Est-ce d'accord ? (o/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, 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:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Phrase de passe invalide ; r�essayez"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION: Cl� faible d�tect�e - changez encore la phrase de passe.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 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/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "cl� faible g�n�r�e - nouvel essai\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "impossible d'�viter une cl� faible pour le chiffrement sym�trique:\n"
 "%d essais ont eu lieu !\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISSEMENT: conflit de hachage de signature dans le message\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s a un certificat crois�\n"
 "invalide\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la cl� publique %s est plus r�cente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la cl� publique %s est plus r�cente de %lu secondes que la signature\n"
 
 # on s'amuse comme on peut...
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5622,7 +5974,7 @@ msgstr ""
 "la cl� %s a �t� cr��e %lu seconde dans le futur (rupture\n"
 "spatio-temporelle ou probl�me d'horloge)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5630,62 +5982,62 @@ msgstr ""
 "la cl� %s a �t� cr��e %lu secondes dans le futur (rupture\n"
 "spatio-temporelle ou probl�me d'horloge)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTE: la cl� de signature %s a expir� le %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "la signature de la cl� %s est suppos�e �tre fausse car un bit\n"
 "critique est inconnu\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cl� %s: pas de sous-cl� pour la signature de r�vocation de sous-cl�\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "cl� %s: pas de sous-cl� pour la signature de liaison � la\n"
 "sous-cl�\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5693,7 +6045,7 @@ 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:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5712,13 +6064,13 @@ msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de: � %s �\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "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:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5726,42 +6078,42 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n"
 "d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la cl� n'est pas marqu�e comme non-s�re; on ne peut pas l'utiliser avec le\n"
 "pseudo-g�n�rateur de nombres al�atiores !\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "� %s � a �t� ignor�: dupliqu�\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "� %s � a �t� ignor�: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "ignor�: cl� secr�te d�j� pr�sente\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "c'est une cl� ElGamal g�n�r�e par PGP qui n'est pas s�re pour\n"
@@ -5819,52 +6171,52 @@ msgstr "erreur de lecture dans `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance: la synchronisation a �chou�: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, 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:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "enregistrement de la base de confiance %lu: l'�criture a �chou� (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop volumineuse\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: le r�pertoire n'existe pas !\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "impossible de cr�er un verrou pour `%s'\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "impossible de verrouiller `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: impossible de cr�er un enregistrement de version: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de confiance invalide cr��e\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de confiance cr��e\n"
@@ -5873,80 +6225,80 @@ msgstr "%s: base de confiance cr��e\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTE: la base de confiance n'a pas les permissions d'�criture\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de confiance invalide\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, 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:659
+#: g10/tdbio.c:650
 #, 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:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, 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:735
+#: g10/tdbio.c:726
 #, 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:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance: �lseek()� a �chou�: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, 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:1203
+#: g10/tdbio.c:1196
 #, 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:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: enregistrement de version avec un num�ro %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: version %d du fichier invalide\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, 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:1419
+#: g10/tdbio.c:1412
 #, 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:1429
+#: g10/tdbio.c:1422
 #, 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:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: impossible d'ajouter un enregistrement: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
@@ -5955,7 +6307,7 @@ msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossible de traiter les lignes plus longues que %d caract�res\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
@@ -6133,7 +6485,7 @@ msgstr ""
 "impossible de mettre � jour l'enregistrement de version de la\n"
 "base de confiance: l'�criture a �chou�: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6143,347 +6495,1654 @@ 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:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "la ligne d'entr�e %u est trop longue ou il manque un caract�re de saut\n"
 "de ligne\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "erreur g�n�rale"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "type de paquet inconnu"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "version inconnue"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "la signature a �chou�: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "algorithme � cl� publique inconnu"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "renommer `%s' en `%s' a �chou�: %s \n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "algorithme de hachage inconnu"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "mauvaise cl� publique"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "mauvaise cl� secr�te"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr ""
+"Signaler toutes anomalies � <[email protected]> (en anglais)\n"
+"et tout probl�me de traduction � <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "mauvaise signature"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "somme de contr�le erron�e"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "mauvaise phrase de passe"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "cl� publique non trouv�e"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "algorithme de chiffrement inconnu"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "impossible d'ouvrir le porte-cl�s"
+#: scd/app-openpgp.c:609
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "impossible de stocker la date de cr�ation: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "paquet invalide"
+#: scd/app-openpgp.c:1004
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "armure invalide"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "pas d'utilisateur de ce nom"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr "la r�ponse ne contient pas le modulo RSA\n"
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "la cl� secr�te n'est pas disponible"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "mauvaise cl� secr�te utilis�e"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "l'appel du PIN a retourn� une erreur: %s\n"
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "non support�"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+"Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
+"est %d\n"
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "mauvaise cl�"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "erreur de lecture"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "erreur d'�criture"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "algorithme de compression inconnu"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "erreur d'ouverture de fichier"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+"%d tentatives de PIN admin restent jusqu'� ce que la carte\n"
+"soit irr�m�diablement bloqu�e\n"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "erreur de cr�ation de fichier"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr "|A|code PIN d'administration"
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "phrase de passe invalide"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr "|AN|Nouveau code PIN d'administration"
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algorithme � cl� publique non implant�"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr "|N|Nouveau code PIN"
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "algorithme de chiffrement non implant�"
+#: scd/app-openpgp.c:1535
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "classe de signature inconnue"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+msgid "error reading application data\n"
+msgstr "erreur pendant la lecture de donn�es d'application\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "erreur dans la base de confiance"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+msgid "error reading fingerprint DO\n"
+msgstr "erreur pendant la lecture de l'empreinte DO\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "mauvais entier en pr�cision multiple (MPI)"
+#: scd/app-openpgp.c:1601
+msgid "key already exists\n"
+msgstr "la cl� existe d�j�\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "limite de ressources atteinte"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr "la cl� existante sera remplac�e\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "porte-cl�s invalide"
+#: scd/app-openpgp.c:1607
+msgid "generating new key\n"
+msgstr "g�n�rer une nouvelle cl�\n"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "mauvais certificat"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr "l'horodatage de cr�ation est manquant\n"
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "nom d'utilisateur malform�"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "erreur de fermeture de fichier"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "l'exposant public RSA est manquant ou trop �lev� (plus de %d bits)\n"
+
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+"le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n"
+"%d bits\n"
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "erreur pendant le changement de nom du fichier"
+#: scd/app-openpgp.c:1866
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "erreur pendant la suppression du fichier"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr "attendez que la cl� se g�n�re...\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "donn�es inattendues"
+#: scd/app-openpgp.c:1939
+msgid "generating key failed\n"
+msgstr "la g�n�ration de la cl� a �chou�\n"
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "conflit de dates"
+#: scd/app-openpgp.c:1942
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "la g�n�ration de cl� a �t� effectu�e (%d secondes)\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "algorithme de cl�s publiques inutilisable"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "le fichier existe"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "signature %s, algorithme de hachage %s\n"
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "cl� faible"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "argument invalide"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "mauvaise adresse (URI)"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"la v�rification du code PIN d'administration est actuellement interdite\n"
+"au travers de cette commande\n"
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "URI non support�e"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "erreur de r�seau"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "non chiffr�"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "lire les options de `%s'\n"
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "non trait�"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "cl� publique inutilisable"
+#: scd/scdaemon.c:122
+msgid "|NAME|use NAME as ct-API driver"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "cl� secr�te inutilisable"
+#: scd/scdaemon.c:123
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr ""
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "erreur du serveur de cl�s"
+#: scd/scdaemon.c:126
+msgid "do not use the internal CCID driver"
+msgstr ""
 
-#: util/errors.c:109
-msgid "canceled"
-msgstr "annul�"
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
-msgid "no card"
-msgstr "pas de carte"
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "indiquer les commandes d'administration"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "pas de donn�es sign�es\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: util/logger.c:158
-msgid "ERROR: "
-msgstr "ERREUR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
-msgstr "AVERTISSEMENT: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... c'est un bug (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "vous avez trouv� un bug... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "oui"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "caract�re %02X invalide en radix64 ignor�\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "oO"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "le protocole gpg-agent version %d n'est pas support�\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "le protocole gpg-agent version %d n'est pas support�\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "Impossible d'ouvrir `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "il est interdit d'exporter les cl� secr�tes\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "le stockage de la cl� a �chou�: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "NOTE: la cl� a �t� r�voqu�e"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "mauvais certificat"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Cl� disponible sur: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "Impossible de v�rifier la signature cr��e: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "g�n�rer un certificat de r�vocation"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Cette cl� a expir� !"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "empreinte de l'autorit� de certification: "
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "Impossible de v�rifier la signature cr��e: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "v�rifier une signature"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+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"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "non"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "[non positionn�]"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "Erreur: r�ponse invalide.\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "Erreur: r�ponse invalide.\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Vous avez besoin d'une phrase de passe pour d�verrouiller la cl�\n"
+"secr�te pour l'utilisateur:\n"
+"\"%.*s\"\n"
+"cl� %u bits %s, ID %s, cr��e %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr ""
+"erreur durant la lecture des informations contenues actuellement\n"
+"dans la cl�: %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "algorithme de hachage `%s' invalide\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Ce n'est pas une adresse e-mail valide\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "La g�n�ration de cl� a �chou�: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "la cl� secr�te � %s � n'a pas �t� trouv�e: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "Certificat de r�vocation cr��.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "pr�f�rence `%s' dupliqu�e\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(Aucune description donn�e)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr ""
+"%s: erreur pendant l'�criture de l'enregistrement de\n"
+"r�pertoire: %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[fichier]|faire une signature"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[fichier]|faire une signature en texte clair"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "lister les cl�s secr�tes"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "mauvais certificat"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "enlever les cl�s du porte-cl�s public"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "mauvais certificat"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "mauvais certificat"
+
+#: sm/gpgsm.c:263
+#, fuzzy
+msgid "register a smartcard"
+msgstr "ajouter une cl� � une carte � puce"
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "changer la phrase de passe"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "cr�er une sortie ascii avec armure"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr ""
+
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "use the default key as default recipient"
+msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "force v3 signatures"
+msgstr "v�rifier les signatures"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr ""
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr ""
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:351
+#, fuzzy
+msgid "add this keyring to the list of keyrings"
+msgstr "enlever les cl�s de ce porte-cl�s"
+
+#: sm/gpgsm.c:352
+#, fuzzy
+msgid "add this secret keyring to the list"
+msgstr "Il faut la cl� secr�te pour faire cela.\n"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr ""
+
+#: sm/gpgsm.c:355
+#, fuzzy
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NOM|chiffrer pour NOM"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr ""
+
+#: sm/gpgsm.c:380
+#, fuzzy
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "algorithme de chiffrement inconnu"
+
+#: sm/gpgsm.c:382
+#, fuzzy
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "signature %s, algorithme de hachage %s\n"
+
+#: sm/gpgsm.c:384
+#, fuzzy
+msgid "|N|use compress algorithm N"
+msgstr "algorithme de compression inconnu"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Syntaxe: gpg [options] [fichiers]\n"
+"signer, v�rifier, chiffrer ou d�chiffrer\n"
+"l'op�ration par d�faut d�pend des donn�es entr�es\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "utilisation: gpg [options] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "impossible de se connecter � `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "impossible d'acc�der � `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "       Quantit� totale trait�e: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "g�n�rer un certificat de r�vocation"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "le porte-cl�s `%s` a �t� cr��\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "impossible de stocker l'empreinte: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "le stockage de la cl� a �chou�: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr ""
+"erreur pendant la recherche de l'enregistrement de confiance\n"
+"dans `%s': %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr ""
+"erreur durant la lecture des informations contenues actuellement\n"
+"dans la cl�: %s\n"
+
+#: sm/keydb.c:1392
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "Erreur: empreinte mal format�e.\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "Impossible de v�rifier la signature cr��e: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Signature faite le %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Bonne signature de � %s �"
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                alias � %s �"
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "quitter"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "qQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
-msgstr "ok|ok"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
-msgstr "annuler|annuler"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
+msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
-msgstr "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
+msgstr ""
 
-#: util/miscutil.c:411
-msgid "cC"
-msgstr "aA"
+#: tools/gpg-connect-agent.c:126
+#, fuzzy
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "AVERTISSEMENT: l'utilisation de la m�moire n'est pas s�re !\n"
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
 
-#: util/secmem.c:98
-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"
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "ligne trop longue"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "option `%s' inconnue\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "la signature a �chou�: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "la lecture de la cl� publique a �chou�: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr ""
+"erreur pendant la recherche de l'enregistrement de confiance\n"
+"dans `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "utilisation: gpg [options] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "cl� publique non trouv�e"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Commandes:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "le d�chiffrement a r�ussi\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "le d�chiffrement a r�ussi\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [nom du fichier]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s n'est pas permis avec %s !\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "fstat de `%s' �chou� dans %s: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "erreur dans `%s': %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "aucun programme d'ex�cution distante n'est support�\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "impossible de cr�er `%s': %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "impossible de cr�er `%s': %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "la mise � jour a �chou�: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "la mise � jour a �chou�: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "la mise � jour a �chou�: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "la mise � jour a �chou�: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\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:352
-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"
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "le hachage de protection %d n'est pas support�\n"
+
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "impossible de g�n�rer un nombre premier avec pbits=%u qbits=%u\n"
+
+#~ 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"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "impossible de verrouiller `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "�criture de la cl� secr�te dans `%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "impossible d'acc�der � `%s': %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' n'est pas un fichier r�gulier - ignor�\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "note: le fichier `random_seed' est vide\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr ""
+#~ "AVERTISSEMENT: la taille du fichier `random_seed' est invalide.\n"
+#~ "Celui-ci ne sera pas utilis�.\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "impossible de lire `%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "impossible d'�crire `%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "impossible de fermer `%s': %s\n"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgid "WARNING: using insecure random number generator!!\n"
 #~ msgstr ""
-#~ "DSA n�cessite l'utilisation d'un algorithme de hachage de 160 bits\n"
+#~ "ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "voir http://www.gnupg.org/fr/why-not-idea.html pour plus d'informations\n"
+#~ "Le g�n�rateur de nombres al�atoires n'est qu'un artifice visant � "
+#~ "ex�cuter\n"
+#~ "GnuPG - ce n'est en aucune mani�re un g�n�rateur (RNG) fort!\n"
+#~ "\n"
+#~ "N'UTILISEZ PAS LES DONN�ES G�N�R�ES PAR CE PROGRAMME !!\n"
+#~ "\n"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "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 ""
-#~ "le nom d'une notation ne doit comporter que des caract�res imprimables\n"
-#~ "ou des espaces, et se terminer par un signe '='\n"
+#~ "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"
+
+#~ 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"
+#~ "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"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "la cl� secr�te n'est pas disponible"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
+#~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
+#~ msgstr "Ins�rez la carte et tapez entr�e ou entrez 'c' pour annuler: "
 
-#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgid ""
+#~ "Please remove the current card and insert the one with serial number:\n"
+#~ "   %.*s\n"
 #~ msgstr ""
-#~ "un nom de notation utilisateur ne doit pas plus d'un caract�re '@'\n"
+#~ "Supprimez la carte pr�sente et ins�rez celle portant le num�ro de\n"
+#~ "s�rie:\n"
+#~ "   %.*s\n"
+
+#~ msgid "Hit return when ready or enter 'c' to cancel: "
+#~ msgstr "Tapez entr�e quand vous �tes pr�t ou entrez 'c' pour annuler: "
+
+#~ msgid "Enter New Admin PIN: "
+#~ msgstr "Entrez le nouveau code PIN admin: "
+
+#~ msgid "Enter New PIN: "
+#~ msgstr "Entrez le nouveau code PIN: "
+
+#~ msgid "Enter Admin PIN: "
+#~ msgstr "Entrez le code PIN admin: "
+
+#~ msgid "Enter PIN: "
+#~ msgstr "Entrez le code PIN: "
+
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "NOTE: %s n'est pas disponible dans cette version\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n"
+
+#~ msgid "general error"
+#~ msgstr "erreur g�n�rale"
+
+#~ msgid "unknown packet type"
+#~ msgstr "type de paquet inconnu"
+
+#~ msgid "unknown version"
+#~ msgstr "version inconnue"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "algorithme � cl� publique inconnu"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "algorithme de hachage inconnu"
+
+#~ msgid "bad public key"
+#~ msgstr "mauvaise cl� publique"
+
+#~ msgid "bad secret key"
+#~ msgstr "mauvaise cl� secr�te"
+
+#~ msgid "bad signature"
+#~ msgstr "mauvaise signature"
+
+#~ msgid "checksum error"
+#~ msgstr "somme de contr�le erron�e"
 
-#~ msgid "a notation value must not use any control characters\n"
+#~ msgid "can't open the keyring"
+#~ msgstr "impossible d'ouvrir le porte-cl�s"
+
+#~ msgid "invalid packet"
+#~ msgstr "paquet invalide"
+
+#~ msgid "invalid armor"
+#~ msgstr "armure invalide"
+
+#~ msgid "no such user id"
+#~ msgstr "pas d'utilisateur de ce nom"
+
+#~ msgid "secret key not available"
+#~ msgstr "la cl� secr�te n'est pas disponible"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "mauvaise cl� secr�te utilis�e"
+
+#~ msgid "not supported"
+#~ msgstr "non support�"
+
+#~ msgid "bad key"
+#~ msgstr "mauvaise cl�"
+
+#~ msgid "file read error"
+#~ msgstr "erreur de lecture"
+
+#~ msgid "file write error"
+#~ msgstr "erreur d'�criture"
+
+#~ msgid "file open error"
+#~ msgstr "erreur d'ouverture de fichier"
+
+#~ msgid "file create error"
+#~ msgstr "erreur de cr�ation de fichier"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "phrase de passe invalide"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algorithme � cl� publique non implant�"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "algorithme de chiffrement non implant�"
+
+#~ msgid "unknown signature class"
+#~ msgstr "classe de signature inconnue"
+
+#~ msgid "trust database error"
+#~ msgstr "erreur dans la base de confiance"
+
+#~ msgid "resource limit"
+#~ msgstr "limite de ressources atteinte"
+
+#~ msgid "invalid keyring"
+#~ msgstr "porte-cl�s invalide"
+
+#~ msgid "malformed user id"
+#~ msgstr "nom d'utilisateur malform�"
+
+#~ msgid "file close error"
+#~ msgstr "erreur de fermeture de fichier"
+
+#~ msgid "file rename error"
+#~ msgstr "erreur pendant le changement de nom du fichier"
+
+#~ msgid "file delete error"
+#~ msgstr "erreur pendant la suppression du fichier"
+
+#~ msgid "unexpected data"
+#~ msgstr "donn�es inattendues"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "conflit de dates"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "algorithme de cl�s publiques inutilisable"
+
+#~ msgid "file exists"
+#~ msgstr "le fichier existe"
+
+#~ msgid "weak key"
+#~ msgstr "cl� faible"
+
+#~ msgid "invalid argument"
+#~ msgstr "argument invalide"
+
+#~ msgid "bad URI"
+#~ msgstr "mauvaise adresse (URI)"
+
+#~ msgid "unsupported URI"
+#~ msgstr "URI non support�e"
+
+#~ msgid "network error"
+#~ msgstr "erreur de r�seau"
+
+#~ msgid "not encrypted"
+#~ msgstr "non chiffr�"
+
+#~ msgid "not processed"
+#~ msgstr "non trait�"
+
+#~ msgid "unusable public key"
+#~ msgstr "cl� publique inutilisable"
+
+#~ msgid "unusable secret key"
+#~ msgstr "cl� secr�te inutilisable"
+
+#~ msgid "keyserver error"
+#~ msgstr "erreur du serveur de cl�s"
+
+#~ msgid "no card"
+#~ msgstr "pas de carte"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "pas de donn�es sign�es\n"
+
+#~ msgid "ERROR: "
+#~ msgstr "ERREUR: "
+
+#~ msgid "WARNING: "
+#~ msgstr "AVERTISSEMENT: "
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... c'est un bug (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "AVERTISSEMENT: l'utilisation de la m�moire n'est pas s�re !\n"
+
+#~ 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"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr ""
-#~ "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
+#~ "l'op�ration n'est pas possible tant que la m�moire s�re n'est pas\n"
+#~ "initialis�e\n"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
+#~ 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"
 
-#~ msgid "not human readable"
-#~ msgstr "illisible par un humain"
+#~ 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"
 
 #~ msgid "expired: %s)"
 #~ msgstr "expir�e: %s)"
diff --git a/po/gl.po b/po/gl.po
index ff183df84..f71a20490 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -14,299 +14,727 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: agent/call-pinentry.c:193
 #, 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"
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "non se puido abrir `%s'\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "li�a longa de m�is\n"
+
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "contrasinal demasiado longo\n"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Caracter non v�lido no nome\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "MPI err�neo"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "contrasinal err�neo"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "contrasinal err�neo"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "gravando a chave secreta en `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "non se pode crear `%s': %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "non se puido facer stat sobre `%s': %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' non � un ficheiro normal - ign�rase\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "nota: o ficheiro random_seed est� baleiro\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "non se pode ler de `%s': %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "nota: o ficheiro random_seed non se actualiza\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "non se pode crear `%s': %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "non se pode escribir en `%s': %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "non se pode pechar `%s': %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "AVISO: ��empr�gase un xerador de n�meros aleatorios inseguro!!\n"
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "Introduza o ID de usuario: "
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Repita o contrasinal: "
+
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
+
+#: agent/divert-scd.c:290
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
-"O xerador de n�meros aleatorios s� � un truco para poder\n"
-"executalo - �non � de ning�n xeito un xerador de n�meros\n"
-"aleatorios seguro!\n"
-"\n"
-"�NON USE NINGUN DATO XERADO POR ESTE PROGRAMA!\n"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: cipher/rndegd.c:202
-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"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "cambia-lo contrasinal"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 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/rndlinux.c:132
-#, c-format
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "cambia-lo contrasinal"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"\n"
-"Non hai suficientes bytes aleatorios dispo�ibles. Por favor, faga outro\n"
-"traballo para lle dar ao sistema operativo unha oportunidade de acumular\n"
-"m�is entrop�a (Prec�sanse %d bytes m�is)\n"
+"@\n"
+"Opci�ns:\n"
+" "
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "fallou o borrado do bloque de chaves: %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "lareto"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "ser un pouqui�o m�is calado"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "buscar chaves nun servidor de chaves"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
 msgstr ""
+"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
+"seleccionados? "
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "actualiza-la base de datos de confianza"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr ""
+"Por favor, informe dos erros no programa a <[email protected]>,\n"
+"e dos erros na traducci�n a <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
+msgstr ""
+
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "o env�o ao servidor de chaves fallou: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "ficheiro de opci�ns `%s': %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "lendo as opci�ns de `%s'\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "erro ao crear `%s': %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "non se pode crea-lo directorio `%s': %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "non foi posible crear %s: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "erro ao enviar a `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "a actualizaci�n fallou: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "gravando a chave secreta en `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: directorio creado\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: non foi posible crear un directorio: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "erro ao crea-lo contrasinal: %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "\t%lu chaves omitidas\n"
+
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "erro ao le-lo bloque de chaves: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, 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/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: erro ao ler un rexistro libre: %s\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' xa est� comprimido\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "xerar un novo par de chaves"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "contrasinal err�neo"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "Cancelar"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "non se atopou a chave `%s': %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "hai partes da chave secreta non dispo�ibles\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "erro de lectura: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "fallou o borrado do bloque de chaves: %s\n"
+msgid "Yes"
+msgstr "si|sim"
 
-#: g10/app-openpgp.c:1904
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "A xeraci�n da chave fallou: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "non se puido abrir un ficheiro: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "Sinatura %s, algoritmo de resumo %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "erro lendo `%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "erro lendo `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "erro ao crear `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "%s: usuario non atopado\n"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "non se puido conectar a `%s': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "problema de comunicaci�n con gpg-agent\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "cancelado polo usuario\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "si|sim"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "sS"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "non|nom"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "abandonar"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "aA"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "non se atoparon datos OpenPGP v�lidos.\n"
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "v"
 
 #: g10/armor.c:320
 #, c-format
@@ -385,176 +813,213 @@ msgstr ""
 "car�cter quoted-printable na armadura - seguramente empregouse un MTA con "
 "erros\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+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 caracteres imprimibles ou espacios, e debe "
+"rematar en '='\n"
+
+#: g10/build-packet.c:956
+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/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
+
+#: g10/build-packet.c:980
+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/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "non lexible por humanos"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non est� dispo�ible"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "Non se especificou un motivo"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -562,210 +1027,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "a chave secreta non est� dispo�ible"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "fallou o borrado do bloque de chaves: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-#, fuzzy
-msgid "Enter New Admin PIN: "
-msgstr "Introduza o ID de usuario: "
-
-#: g10/cardglue.c:918
-#, fuzzy
-msgid "Enter New PIN: "
-msgstr "Introduza o ID de usuario: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-#, fuzzy
-msgid "Enter PIN: "
-msgstr "Introduza o ID de usuario: "
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Repita o contrasinal: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output non traballa con este comando\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -809,54 +1219,54 @@ msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "non se pode empregar un paquete sim�trico ESK debido ao modo S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: 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:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -865,172 +1275,208 @@ msgstr ""
 "forza-lo algoritmo de compresi�n %s (%d) viola as preferencias do "
 "destinatario\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, 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:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado sim�trico.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao manexa-lo paquete cifrado\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "non se soporta a execuci�n remota de programas\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "non se pode crea-lo directorio `%s': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "esta plataforma precisa de ficheiros temporais ao chamar a programas "
 "externos\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "non se puido executar %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "non se puido executar %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "sa�da non natural do programa externo\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "non se puido executar un programa externo\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, 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:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, 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/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chave secreta non utilizable"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, 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:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, 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:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[Non se atopou o id de usuario]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, 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:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
+
+#: g10/getkey.c:2659
+#, 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/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1038,128 +1484,129 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1169,51 +1616,47 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "lareto"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1221,7 +1664,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1241,17 +1684,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 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/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1261,7 +1704,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1269,642 +1712,581 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, 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/gpg.c:1282
+#: g10/gpg.c:1298
 #, 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/gpg.c:1285
+#: g10/gpg.c:1301
 #, 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/gpg.c:1291
+#: g10/gpg.c:1307
 #, 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/gpg.c:1294
+#: g10/gpg.c:1310
 #, 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/gpg.c:1297
+#: g10/gpg.c:1313
 #, 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/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "ficheiro de opci�ns `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "lendo as opci�ns de `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, 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/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 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/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 #, 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/gpg.c:2988
+#: g10/gpg.c:3012
 #, 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 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/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, fuzzy, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, fuzzy, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 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/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, 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/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, 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/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[Non se atopou o id de usuario]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, 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:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
-
-#: g10/getkey.c:2658
-#, 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/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "ser un pouqui�o m�is calado"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "toma-las chaves deste chaveiro"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1912,7 +2294,7 @@ msgstr ""
 "Sintaxe: gpg [opci�ns] [ficheiros]\n"
 "Comproba as sinaturas contra chaves de confianza co�ecidas\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1922,7 +2304,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:55
+#: g10/helptext.c:57
 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"
@@ -1933,16 +2315,16 @@ 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:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1956,7 +2338,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1966,16 +2348,16 @@ msgstr ""
 "Este algoritmo deber�a empregarse s� en determinados dominios.\n"
 "Consulte antes co seu experto en seguridade."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Introduza o tama�o da chave"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Conteste \"si\" ou \"non\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1987,19 +2369,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:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Introduza o nome do propietario da chave"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 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:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Por favor, introduza un comentario (opcional)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2013,11 +2395,11 @@ msgstr ""
 "O  para continuar coa xeraci�n da chave.\n"
 "S  para sa�r da xeraci�n da chave."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2090,12 +2472,12 @@ msgstr ""
 "\n"
 "Se non sabe cal � a resposta correcta, resposte \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Conteste \"si\" se quere asinar T�DOLOS IDs de usuario"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2103,11 +2485,11 @@ msgstr ""
 "Conteste \"si\" se realmente desexa borrar este ID de usuario.\n"
 "�Tam�n se han perder t�dolos certificados!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Conteste \"si\" se � correcto borrar esta subchave"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2117,7 +2499,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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2129,13 +2511,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:211
+#: g10/helptext.c:213
 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:215
+#: g10/helptext.c:217
 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"
@@ -2149,7 +2531,7 @@ msgstr ""
 "s� se esta auto-sinatura non � correcta por algun motivo e hai\n"
 "unha segunda � s�a disposici�n."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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"
@@ -2159,24 +2541,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:230
+#: g10/helptext.c:232
 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:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 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:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Conteste \"si\" se � correcto sobrescribi-lo ficheiro"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2184,7 +2566,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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2212,7 +2594,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:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2222,11 +2604,11 @@ msgstr ""
 "certificado de revocaci�n. Por favor, mante�a este texto breve.\n"
 "Unha li�a en branco remata o texto.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Non hai axuda dispo�ible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispo�ible para `%s'"
@@ -2262,506 +2644,501 @@ msgstr "chave secreta non utilizable"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       non importadas: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Asinou estes IDs de usuario: \n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, 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:764
+#: g10/import.c:763
 #, 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:770
+#: g10/import.c:769
 #, 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:772
+#: g10/import.c:771
 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:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, 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:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, 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:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, fuzzy, c-format
 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, 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:1276
+#: g10/import.c:1275
 #, 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:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, 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:1389
+#: g10/import.c:1388
 #, 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:1391
+#: g10/import.c:1390
 #, 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:1409
+#: g10/import.c:1408
 #, 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:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, 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:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 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:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, 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:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 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:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, 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 %"
 "08lX\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, 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 revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 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:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 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:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2773,63 +3150,63 @@ msgstr ""
 "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
 "comprobando pegadas dactilares de varias fontes...).\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o marxinalmente\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "O ID de usuario \"%s\" est� caducado."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, 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:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2838,11 +3215,11 @@ msgstr ""
 "A auto-sinatura de \"%s\"\n"
 "� unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2851,11 +3228,11 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2864,54 +3241,54 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 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:780
+#: g10/keyedit.c:781
 #, 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:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 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:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 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:891
+#: g10/keyedit.c:892
 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2920,32 +3297,32 @@ 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:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2954,100 +3331,100 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a sinatura non se ha marcar coma non exportable.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: A sinatura non se ha marcar coma non revocable.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 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:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3055,11 +3432,11 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3067,212 +3444,212 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, 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:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3280,243 +3657,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "clase de sinatura desco�ecida"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3524,19 +3901,19 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3544,7 +3921,7 @@ 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:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3553,57 +3930,57 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3613,378 +3990,383 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 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"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 #, fuzzy
 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, 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:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 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:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4000,7 +4382,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4016,40 +4398,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4057,12 +4439,12 @@ 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:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4079,44 +4461,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4127,7 +4509,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
@@ -4143,23 +4525,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4167,12 +4549,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4184,7 +4566,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4196,50 +4578,50 @@ 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:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, 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:3047
+#: g10/keygen.c:3228
 #, 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:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 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:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4249,12 +4631,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4262,7 +4644,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4270,31 +4652,31 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "nunca     "
 
@@ -4322,631 +4704,604 @@ msgstr "Notaci�n de sinaturas: "
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existen dous ficheiros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o que non cambiou\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor, ama�e este posible fallo de seguridade\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "comprobando o chaveiro `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o moi estra�o para unha chave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chave de sesi�n cifrada con %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 "a actualizaci�n da base de datos de confianza fallou:\n"
 "%s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de cifrado non implementado"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = amosar m�is informaci�n\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "O ficheiro `%s' xa existe. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desco�ecido\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Introduza o novo nome de ficheiro"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "escribindo na sa�da est�ndar\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suponse que hai datos asinados en `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: directorio creado\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, 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:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
-
-#: g10/passphrase.c:345
-#, 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/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "non se puido conectar a `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema co axente - desactivando o emprego do axente\n"
@@ -5012,7 +5367,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Repita o contrasinal: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5026,39 +5381,35 @@ msgstr ""
 "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:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduza o nome do ficheiro JPEG: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" non � un ficheiro JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�� esta foto correcta (s/N/q)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
 
@@ -5345,61 +5696,56 @@ msgstr "non hai enderezos v�lidos\n"
 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:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "erro ao crear `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Sinatura non adxunta.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Por favor, introduza o nome do ficheiro de datos: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "lendo de stdin ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "non hai datos asinados\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, 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:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "vale, n�s somo-lo destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 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:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, 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:302
+#: g10/pubkey-enc.c:305
 #, 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:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
@@ -5521,93 +5867,93 @@ msgstr "(Non se deu unha descrici�n)\n"
 msgid "Is this okay? (y/N) "
 msgstr "�� correcto? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "hai partes da chave secreta non dispo�ibles\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, 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:72
+#: g10/seckey-cert.c:74
 #, 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:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Contrasinal non v�lido; por favor, t�nteo de novo"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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:366
+#: g10/seckey-cert.c:406
 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/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "creouse unha chave feble - volvendo a tentalo\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
 "veces\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 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:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 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:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5615,7 +5961,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5623,66 +5969,66 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, 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:287
+#: g10/sig-check.c:298
 #, 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:544
+#: g10/sig-check.c:560
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chave %08lX: non hai unha sub-chave para o paquete de a revocaci�n de "
 "subchave\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, 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:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5699,53 +6045,53 @@ msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
 "pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave non est� marcada coma insegura - non se pode empregar co xerador de "
 "n�meros aleatorios falso\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "om�tese `%s': duplicada\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "om�tese `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5805,52 +6151,52 @@ msgstr "erro de lectura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, 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:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "rexistro da base de datos de confianza %lu: fallou a escritura (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n da base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �o directorio non existe!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, 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:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creouse a base de datos de confianza\n"
@@ -5859,78 +6205,78 @@ msgstr "%s: creouse a base de datos de confianza\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza non v�lida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, 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:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, 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:735
+#: g10/tdbio.c:726
 #, 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:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: lseek fallou: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, 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:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un ficheiro de base de datos de confianza\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, 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:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n do ficheiro incorrecta %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, 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:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: non se puido engadir un rexistro: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
@@ -5941,7 +6287,7 @@ msgstr ""
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "non � posible manexar li�as de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
@@ -6110,7 +6456,7 @@ msgstr ""
 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:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6120,346 +6466,1629 @@ 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:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "a li�a de entrada %u � longa de m�is ou f�ltalle a marca de fin de li�a\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "erro xeral"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "atopou un erro ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "tipo de paquete desco�ecido"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "versi�n desco�ecida"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "algoritmo de chave p�blica desco�ecido"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "non se puido po�e-la armadura: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "algoritmo de resumo desco�ecido"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr "axusta-los valores de depuraci�n"
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "chave p�blica err�nea"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr "habilitar depuraci�n total"
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "chave secreta err�nea"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr ""
+"Por favor, informe dos erros no programa a <[email protected]>,\n"
+"e dos erros na traducci�n a <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "sinatura err�nea"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "error de checksum"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "contrasinal err�neo"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "non se atopou a chave p�blica"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "algoritmo de cifrado desco�ecido"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "non foi posible abri-lo chaveiro"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "paquete non v�lido"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "armadura non v�lida"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "non hai tal id de usuario"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "a chave secreta non est� dispo�ible"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "empregouse unha chave secreta err�nea"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "non est� soportado"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "chave incorrecta"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "erro de lectura de ficheiro"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "erro de escritura de ficheiro"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "algoritmo de compresi�n desco�ecido"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "erro de apertura de ficheiro"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "erro de creaci�n de ficheiro"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "contrasinal incorrecto"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algoritmo de chave p�blica non implementado"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "algoritmo de cifrado non implementado"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "clase de sinatura desco�ecida"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "erro da base de datos de confianza"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "MPI err�neo"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' xa est� comprimido\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "l�mite de recursos"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "chaveiro incorrecto"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "xerar un novo par de chaves"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "certificado err�neo"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "id de usuario mal formado"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "erro de peche de ficheiro"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "erro de cambio de nome de ficheiro"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "erro de borrado de ficheiro"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "datos inesperados"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "conflicto de selo de data"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "algoritmo de chave p�blica imposible de usar"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "o ficheiro xa existe"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "chave feble"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "argumento non v�lido"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "URI incorrecto"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "URI non soportado"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "erro de rede"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "non cifrado"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "non procesado"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "lendo as opci�ns de `%s'\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "chave p�blica non utilizable"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "chave secreta non utilizable"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "erro do servidor de chaves"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "Cancelar"
+msgid "do not use the internal CCID driver"
+msgstr "non usa-la terminal en absoluto"
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "non cifrado"
+msgid "allow the use of admin card commands"
+msgstr "comandos conflictivos\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "non hai datos asinados\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... isto � un erro (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "atopou un erro ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "si|sim"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "car�cter radix64 non v�lido %02x omitido\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "sS"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "non se puido abrir `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "gravando a chave secreta en `%s'\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "NOTA: a chave est� revocada"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "Certificado correcto"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Chave dispo�ible en: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Certificado correcto"
+
+#: sm/certchain.c:713
+#, fuzzy, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "problema de lectura do certificado: %s\n"
+
+#: sm/certchain.c:729
+#, fuzzy
+msgid "certificate not yet valid"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "problema de lectura do certificado: %s\n"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"Non se atoparon certificados con confianza non definida.\n"
+"\n"
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "Pegada dactilar:"
+
+#: sm/certchain.c:860
+#, fuzzy
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+"Non se atoparon certificados con confianza non definida.\n"
+"\n"
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+#, fuzzy
+msgid "certificate chain too long\n"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:913
+#, fuzzy
+msgid "issuer certificate not found"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "verificar unha sinatura"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "non|nom"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "desco�ecido"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "erro: pegada dactilar non v�lida\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "erro: pegada dactilar non v�lida\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Precisa un contrasinal para desbloquea-la chave secreta do usuario:\n"
+"\"%.*s\"\n"
+"Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "algoritmo de hash non v�lido `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Non � un enderezo de e-mail v�lido\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "A xeraci�n da chave fallou: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "non se atopou a chave `%s': %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "erro ao le-lo bloque de chaves: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "certificado duplicado - borrado"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "certificado duplicado - borrado"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(Non se deu unha descrici�n)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "escribindo a `%s'\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[ficheiro]|facer unha sinatura"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[ficheiro]|facer unha sinatura en texto claro"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "ve-la lista de chaves secretas"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "borrar chaves do chaveiro p�blico"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "Certificado correcto"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "Certificado correcto"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "cambia-lo contrasinal"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "crear sa�da con armadura en ascii"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "usa-la chave por defecto coma o destinatario por defecto"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "non usa-la terminal en absoluto"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "forzar sinaturas v3"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "sempre usar un MDC para cifrar"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "modo por lotes: non preguntar nunca"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "asumir `si' na maior�a das preguntas"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "asumir `non' na maior�a das preguntas"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "engadir este chaveiro � lista de chaveiros"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "engadir este chaveiro secreto � lista"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOME|empregar NOME coma chave secreta por defecto"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|emprega-lo algoritmo de compresi�n N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sintaxe: gpg [opci�ns] [ficheiros]\n"
+"asinar, verificar, cifrar ou descifrar\n"
+"a operaci�n por defecto depende dos datos de entrada\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "uso: gpg [opci�ns] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "non se puido conectar a `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "escribindo a `%s'\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "non se pode pechar `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "N�mero total procesado: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "Certificado correcto"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "chaveiro `%s' creado\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "erro: pegada dactilar non v�lida\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "A sinatura caducou o %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Sinatura correcta de \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "               alias \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "abandonar"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "aA"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "v"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "li�a longa de m�is\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "destinatario por defecto `%s' desco�ecido\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "fallou a sinatura: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "erro ao enviar a `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "erro ao enviar a `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+#, fuzzy
+msgid "Options useful for debugging"
+msgstr "habilitar depuraci�n total"
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "uso: gpg [opci�ns] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "non se atopou a chave p�blica"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Comandos:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "descifrado correcto\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "descifrado correcto\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [ficheiro]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "�%s non se admite con %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr ""
+"a actualizaci�n da base de datos de confianza fallou:\n"
+"%s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "non se pode crea-lo directorio `%s': %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "non se puido abrir %s: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "erro escribindo no chaveiro `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "erro lendo `%s': %s\n"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "AVISO: ��sase memoria insegura!\n"
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "non se soporta a execuci�n remota de programas\n"
 
-#: util/secmem.c:98
-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"
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "non foi posible crear %s: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "non foi posible crear %s: %s\n"
+
+#: tools/symcryptrun.c:606
+#, fuzzy, c-format
+msgid "could not fork: %s\n"
+msgstr "%s: non se atopou o usuario: %s\n"
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "a actualizaci�n fallou: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "a actualizaci�n fallou: %s\n"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "a actualizaci�n fallou: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "a actualizaci�n fallou: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "non se pode crear `%s': %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "non se pode crear `%s': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
+
+#, fuzzy
+#~ 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"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
+#~ 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"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "non se puido abrir `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "gravando a chave secreta en `%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "non se puido facer stat sobre `%s': %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' non � un ficheiro normal - ign�rase\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "nota: o ficheiro random_seed est� baleiro\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "non se pode ler de `%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "nota: o ficheiro random_seed non se actualiza\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "non se pode escribir en `%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "non se pode pechar `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "AVISO: ��empr�gase un xerador de n�meros aleatorios inseguro!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "mire en http://www.gnupg.org/why-not-idea.html para obter m�is "
-#~ "informaci�n\n"
+#~ "O xerador de n�meros aleatorios s� � un truco para poder\n"
+#~ "executalo - �non � de ning�n xeito un xerador de n�meros\n"
+#~ "aleatorios seguro!\n"
+#~ "\n"
+#~ "�NON USE NINGUN DATO XERADO POR ESTE PROGRAMA!\n"
+#~ "\n"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "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 ""
-#~ "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e "
-#~ "debe rematar en '='\n"
+#~ "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"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
+#~ 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"
+#~ "Non hai suficientes bytes aleatorios dispo�ibles. Por favor, faga outro\n"
+#~ "traballo para lle dar ao sistema operativo unha oportunidade de acumular\n"
+#~ "m�is entrop�a (Prec�sanse %d bytes m�is)\n"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
+#~ msgid "card reader not available\n"
+#~ msgstr "a chave secreta non est� dispo�ible"
 
-#~ 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"
+#, fuzzy
+#~ msgid "Enter New PIN: "
+#~ msgstr "Introduza o ID de usuario: "
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
+#, fuzzy
+#~ msgid "Enter PIN: "
+#~ msgstr "Introduza o ID de usuario: "
 
-#~ msgid "not human readable"
-#~ msgstr "non lexible por humanos"
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Asinou estes IDs de usuario: \n"
+
+#~ msgid "general error"
+#~ msgstr "erro xeral"
+
+#~ msgid "unknown packet type"
+#~ msgstr "tipo de paquete desco�ecido"
+
+#~ msgid "unknown version"
+#~ msgstr "versi�n desco�ecida"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "algoritmo de chave p�blica desco�ecido"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "algoritmo de resumo desco�ecido"
+
+#~ msgid "bad public key"
+#~ msgstr "chave p�blica err�nea"
+
+#~ msgid "bad secret key"
+#~ msgstr "chave secreta err�nea"
+
+#~ msgid "bad signature"
+#~ msgstr "sinatura err�nea"
+
+#~ msgid "checksum error"
+#~ msgstr "error de checksum"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "algoritmo de cifrado desco�ecido"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "non foi posible abri-lo chaveiro"
+
+#~ msgid "invalid packet"
+#~ msgstr "paquete non v�lido"
+
+#~ msgid "invalid armor"
+#~ msgstr "armadura non v�lida"
+
+#~ msgid "no such user id"
+#~ msgstr "non hai tal id de usuario"
+
+#~ msgid "secret key not available"
+#~ msgstr "a chave secreta non est� dispo�ible"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "empregouse unha chave secreta err�nea"
+
+#~ msgid "not supported"
+#~ msgstr "non est� soportado"
+
+#~ msgid "bad key"
+#~ msgstr "chave incorrecta"
+
+#~ msgid "file read error"
+#~ msgstr "erro de lectura de ficheiro"
+
+#~ msgid "file write error"
+#~ msgstr "erro de escritura de ficheiro"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "algoritmo de compresi�n desco�ecido"
+
+#~ msgid "file open error"
+#~ msgstr "erro de apertura de ficheiro"
+
+#~ msgid "file create error"
+#~ msgstr "erro de creaci�n de ficheiro"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "contrasinal incorrecto"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algoritmo de chave p�blica non implementado"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "algoritmo de cifrado non implementado"
+
+#~ msgid "unknown signature class"
+#~ msgstr "clase de sinatura desco�ecida"
+
+#~ msgid "trust database error"
+#~ msgstr "erro da base de datos de confianza"
+
+#~ msgid "resource limit"
+#~ msgstr "l�mite de recursos"
+
+#~ msgid "invalid keyring"
+#~ msgstr "chaveiro incorrecto"
+
+#~ msgid "bad certificate"
+#~ msgstr "certificado err�neo"
+
+#~ msgid "malformed user id"
+#~ msgstr "id de usuario mal formado"
+
+#~ msgid "file close error"
+#~ msgstr "erro de peche de ficheiro"
+
+#~ msgid "file rename error"
+#~ msgstr "erro de cambio de nome de ficheiro"
+
+#~ msgid "file delete error"
+#~ msgstr "erro de borrado de ficheiro"
+
+#~ msgid "unexpected data"
+#~ msgstr "datos inesperados"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "conflicto de selo de data"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "algoritmo de chave p�blica imposible de usar"
+
+#~ msgid "file exists"
+#~ msgstr "o ficheiro xa existe"
+
+#~ msgid "weak key"
+#~ msgstr "chave feble"
+
+#~ msgid "invalid argument"
+#~ msgstr "argumento non v�lido"
+
+#~ msgid "bad URI"
+#~ msgstr "URI incorrecto"
+
+#~ msgid "unsupported URI"
+#~ msgstr "URI non soportado"
+
+#~ msgid "network error"
+#~ msgstr "erro de rede"
+
+#~ msgid "not encrypted"
+#~ msgstr "non cifrado"
+
+#~ msgid "not processed"
+#~ msgstr "non procesado"
+
+#~ msgid "unusable public key"
+#~ msgstr "chave p�blica non utilizable"
+
+#~ msgid "unusable secret key"
+#~ msgstr "chave secreta non utilizable"
+
+#~ msgid "keyserver error"
+#~ msgstr "erro do servidor de chaves"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "non cifrado"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "non hai datos asinados\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... isto � un erro (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "AVISO: ��sase memoria insegura!\n"
+
+#~ 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"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
+
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6497,10 +8126,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "Non hai un ID de usuario para a chave\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "erro ao crea-lo contrasinal: %s\n"
-
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "contrasinal incorrecto ou algoritmo de cifrado desco�ecido (%d)\n"
 
@@ -6513,18 +8138,9 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ 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"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "problema de comunicaci�n con gpg-agent\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "contrasinal demasiado longo\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "resposta do axente non v�lida\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "selecciona-la chave secundaria N"
 
@@ -6770,20 +8386,9 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ "este algoritmo de cifrado est� obsoleto; por favor, empregue un m�is "
 #~ "est�ndar!\n"
 
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "escribindo a `%s'\n"
-
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "sent�molo, non se pode facer isto no modo por lotes\n"
 
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "non se atopou a chave `%s': %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "non se pode crear `%s': %s\n"
-
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "non se puido abrir un ficheiro: %s\n"
@@ -6829,9 +8434,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: AVISO: ficheiro baleiro\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "non se puido abrir %s: %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
 #~ msgstr " %d = Conf�o marxinalmente\n"
@@ -6868,18 +8470,12 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: non se pode crear: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: non foi posible crear un directorio: %s\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr "Se desexa empregar esta chave revocada, conteste \"si\"."
 
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "Non se puido abri-la foto \"%s\": %s\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "non se puido abrir un ficheiro: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "erro: falla un signo de dous puntos\n"
 
@@ -6895,9 +8491,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- atopouse unha revocaci�n falsa\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [caduca: %s]"
@@ -6909,9 +8502,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "[revocada] "
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "non foi posible crear %s: %s\n"
-
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
@@ -6951,18 +8541,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ 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"
 
@@ -6972,48 +8550,18 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ 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 "|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 "|[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"
 
@@ -7036,15 +8584,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ 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"
 
@@ -7096,9 +8635,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\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"
 
@@ -7317,13 +8853,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ "\n"
 
 #~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Non se atoparon certificados con confianza non definida.\n"
-#~ "\n"
-
-#~ msgid ""
 #~ "No trust values changed.\n"
 #~ "\n"
 #~ msgstr ""
@@ -7346,12 +8875,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "Do you really need such a large keysize? "
 #~ msgstr "�Est� seguro de precisar un tama�o de chave tan grande? "
 
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: non se atopou o usuario: %s\n"
-
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "problema de lectura do certificado: %s\n"
-
 #~ msgid "too many entries in unk cache - disabled\n"
 #~ msgstr "demasiadas entradas na cach� de chaves desco�ecidas - desactivada\n"
 
@@ -7362,9 +8885,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "key %08lX: our copy has no self-signature\n"
 #~ msgstr "chave %08lX: a nosa copia non ten auto-sinatura\n"
 
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: usuario non atopado\n"
-
 #~ msgid "assuming bad MDC due to an unknown critical bit\n"
 #~ msgstr "asumindo un MDC incorrecto debido a un bit cr�tico\n"
 
@@ -7422,12 +8942,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "Invalid user ID revocation"
 #~ msgstr "Revocaci�n de ID de usuario non v�lida"
 
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Revocaci�n de certificado v�lida"
-
-#~ msgid "Good certificate"
-#~ msgstr "Certificado correcto"
-
 #~ msgid "Invalid certificate revocation"
 #~ msgstr "Revocaci�n de certificado non v�lida"
 
@@ -7437,9 +8951,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "o rexistro de sinatura %lu[%d] apunta a un rexistro incorrecto.\n"
 
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "certificado duplicado - borrado"
-
 #~ msgid "tdbio_search_dir failed: %s\n"
 #~ msgstr "tdbio_search_dir fallou: %s\n"
 
@@ -7464,9 +8975,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "\t%lu due to new pubkeys\n"
 #~ msgstr "\t%lu debidos a novas chaves p�blicas\n"
 
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu chaves omitidas\n"
-
 #~ msgid "\t%lu keys updated\n"
 #~ msgstr "\t%lu chaves actualizadas\n"
 
@@ -7515,12 +9023,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "%s: can't create keyring: %s\n"
 #~ msgstr "%s: non se pode crea-lo chaveiro: %s\n"
 
-#~ msgid "set debugging flags"
-#~ msgstr "axusta-los valores de depuraci�n"
-
-#~ msgid "enable full debugging"
-#~ msgstr "habilitar depuraci�n total"
-
 #~ msgid "do not write comment packets"
 #~ msgstr "non escribir paquetes de comentario"
 
diff --git a/po/hu.po b/po/hu.po
index 70d612fdc..b2871d80b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -14,298 +14,722 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: agent/call-pinentry.c:193
 #, 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"
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "A sor t�l hossz�!\n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "Nem tudom megnyitni %s-t!\n"
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "A jelsz� t�l hossz�!\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "�rv�nytelen karakter a n�vben!\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "hib�s MPI"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "rossz jelsz�"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "rossz jelsz�"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:458
-#, 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"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, 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:468
-msgid "note: random_seed file is empty\n"
+msgid "detected card with S/N: %s\n"
 msgstr ""
-"Megjegyz�s: random_seed �llom�ny (v�letlensz�m-gener�tor �llapota) �res.\n"
 
-#: cipher/random.c:474
-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"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
-#, c-format
-msgid "can't write `%s': %s\n"
-msgstr "Nem tudom �rni a(z) \"%s\" �llom�nyt: %s.\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: cipher/random.c:569
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't close `%s': %s\n"
-msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "FIGYELEM: Nem biztons�gos v�letlensz�m-gener�tort haszn�lok!!!\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:217
+msgid "Admin PIN"
 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"
+
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Ism�telje meg a jelsz�t: "
+
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
+
+#: agent/divert-scd.c:290
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr ""
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: cipher/rndegd.c:202
-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"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "jelsz�v�ltoztat�s"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 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/rndlinux.c:132
-#, c-format
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "jelsz�v�ltoztat�s"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\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"
+"@\n"
+"Opci�k:\n"
+" "
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "b�besz�d� m�d"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "m�g sz�kszav�bb m�d"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|f�jl|b�v�t� modul bet�lt�se"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "kulcsok keres�se kulcsszerveren"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "bizalmi adatb�zis friss�t�se"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "\"%s\" opci�s f�jl: %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "%s nem hozhat� l�tre: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "Friss�t�s sikertelen: %s.\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: K�nyvt�rat l�trehoztam.\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: Nem tudom a k�nyvt�rat l�trehozni: %s.\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: kihagyva: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "\"%s\" m�r t�m�r�tett.\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "�j kulcsp�r l�trehoz�sa"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "rossz jelsz�"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "M�gsem"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "Olvas�si hiba: %s.\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+msgid "Yes"
+msgstr "igen"
 
-#: g10/app-openpgp.c:1904
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Kulcsgener�l�s sikertelen: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[ismeretlen kulcs]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "igen"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "iI"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "nem"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "kil�p�s|kilepes"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "kK"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: g10/armor.c:320
 #, c-format
@@ -383,176 +807,213 @@ msgid ""
 msgstr ""
 "quoted printable karakter a p�nc�lban - val�sz�n�leg egy bugos MTA b�ne.\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+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/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+
+#: g10/build-packet.c:980
+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/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "nem olvashat� forma"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "Nincs megadva ok."
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -560,207 +1021,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "titkos kulcs nem �ll rendelkez�sre"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr ""
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr ""
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Ism�telje meg a jelsz�t: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -803,223 +1212,260 @@ msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 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/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 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:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s rejtjelez�st haszn�lok.\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Olvasok a \"%s\" �llom�nyb�l.\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: 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:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: 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:715
+#: g10/encode.c:725
 #, 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:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, 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/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkos�tott adat.\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 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:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "Probl�ma a titkos�tott csomag kezel�sekor!\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, 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:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary 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:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 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
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "Nem tudom a v�grehajtani a k�ls� programot.\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, 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:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, 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/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "haszn�lhatatlan titkos kulcs"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, 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:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, 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:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+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:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[ismeretlen kulcs]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, 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:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
+
+#: g10/getkey.c:2659
+#, 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/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1027,128 +1473,129 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1158,51 +1605,47 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 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/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "b�besz�d� m�d"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1210,7 +1653,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1230,15 +1673,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1248,7 +1691,7 @@ msgstr ""
 "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/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1256,640 +1699,578 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, 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/gpg.c:1282
+#: g10/gpg.c:1298
 #, 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/gpg.c:1285
+#: g10/gpg.c:1301
 #, 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/gpg.c:1291
+#: g10/gpg.c:1307
 #, 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/gpg.c:1294
+#: g10/gpg.c:1310
 #, 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/gpg.c:1297
+#: g10/gpg.c:1313
 #, 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/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, 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/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "\"%s\" opci�s f�jl: %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, 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/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, 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/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 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/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 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/gpg.c:2988
+#: g10/gpg.c:3012
 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, fuzzy, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, fuzzy, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 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/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, 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/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, 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/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 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/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/getkey.c:152
-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:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[ismeretlen kulcs]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, 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:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
-
-#: g10/getkey.c:2658
-#, 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/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "m�g sz�kszav�bb m�d"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1897,7 +2278,7 @@ 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/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1907,7 +2288,7 @@ msgstr ""
 "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:55
+#: g10/helptext.c:57
 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"
@@ -1919,18 +2300,18 @@ msgstr ""
 "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:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1944,7 +2325,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1954,16 +2335,16 @@ msgstr ""
 "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:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Adja meg a kulcs m�ret�t!"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "K�rem, adjon \"igen\" vagy \"nem\" v�laszt!"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1975,19 +2356,19 @@ msgstr ""
 "hiba�zenetet kapni, hanem a rendszer megpr�b�lja az �rt�ket\n"
 "intervallumk�nt �rtelmezni."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Adja meg a kulcs tulajdonos�nak a nev�t!"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 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:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "K�rem, adjon meg egy opcion�lis megjegyz�st!"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2001,13 +2382,13 @@ msgstr ""
 "R  kulcsgener�l�s folytat�sa\n"
 "Q  kil�p�s a kulcsgener�l�sb�l"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2081,13 +2462,13 @@ msgstr ""
 "\n"
 "Ha nem tudja, hogy mit v�laszoljon, �rjon \"0\"-t!"
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if 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:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2096,11 +2477,11 @@ msgstr ""
 "felhaszn�l�azonos�t�t!\n"
 "Minden igazol�s t�rl�dik vele egy�tt!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 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:200
+#: g10/helptext.c:202
 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"
@@ -2110,7 +2491,7 @@ msgstr ""
 "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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2122,13 +2503,13 @@ msgstr ""
 "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:211
+#: g10/helptext.c:213
 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:215
+#: g10/helptext.c:217
 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"
@@ -2142,7 +2523,7 @@ msgstr ""
 "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:223
+#: g10/helptext.c:225
 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"
@@ -2152,23 +2533,23 @@ msgstr ""
 "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:230
+#: g10/helptext.c:232
 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:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 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:245
+#: g10/helptext.c:247
 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:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2176,7 +2557,7 @@ 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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2204,7 +2585,7 @@ msgstr ""
 "      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:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2214,11 +2595,11 @@ msgstr ""
 "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:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Nem �ll rendelkez�sre seg�ts�g."
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
@@ -2254,498 +2635,493 @@ msgstr "haszn�lhatatlan titkos kulcs"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d t�pus� blokkot kihagyom.\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "     �sszesen feldolgoztam: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       �j kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    felh. azonos�t� n�lk�l: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                import�lva: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "               v�ltozatlan: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       �j felh. azonos�t�k: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              �j alkulcsok: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     �j kulcsvisszavon�sok: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  import�lt titkos kulcsok: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "v�ltozatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             nem import�lt: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, 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:764
+#: g10/import.c:763
 #, 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:770
+#: g10/import.c:769
 #, 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:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, 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:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, 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:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, 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:914
+#: g10/import.c:913
 #, 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:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, 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:1203
+#: g10/import.c:1202
 #, 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:1233
+#: g10/import.c:1232
 #, 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:1276
+#: g10/import.c:1275
 #, 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:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, 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:1389
+#: g10/import.c:1388
 #, 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:1391
+#: g10/import.c:1390
 #, 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:1409
+#: g10/import.c:1408
 #, 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:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, 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:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, 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:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, 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:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, 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:1618
+#: g10/import.c:1617
 #, 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:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, 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:1788
+#: g10/import.c:1787
 #, 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:1802
+#: g10/import.c:1801
 #, 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:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[visszavon�s]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[�nal��r�s]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 rossz al��r�s.\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d rossz al��r�s.\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 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:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, 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:357
+#: g10/keyedit.c:358
 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:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2758,63 +3134,63 @@ msgstr ""
 "k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = r�szlegesen megb�zom benne\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = teljesen megb�zom benne\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 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:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2823,11 +3199,11 @@ msgstr ""
 "\"%s\" �nal��r�sa\n"
 "PGP 2.x st�lus�.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 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:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2836,11 +3212,11 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson lej�rt.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2849,54 +3225,54 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson helyi al��r�s.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 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:780
+#: g10/keyedit.c:781
 #, 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:783
+#: g10/keyedit.c:784
 #, 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:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "M�g egyszer al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Ez a kulcs lej�rt!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ez a kulcs lej�r: %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 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:891
+#: g10/keyedit.c:892
 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2905,32 +3281,32 @@ 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:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nem v�laszolok.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, 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:925
+#: g10/keyedit.c:926
 #, 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:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2939,100 +3315,100 @@ msgstr ""
 "Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
 "az �n kulcs�val: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "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:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "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:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "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:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "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:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 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:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3040,11 +3416,11 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3052,206 +3428,206 @@ msgstr ""
 "�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tilt�sa"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkez�sre �ll.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3259,241 +3635,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "A kulcsot visszavont�k."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 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:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 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:1818
+#: g10/keyedit.c:1819
 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:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 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:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Jel�l�s: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3501,19 +3877,19 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3521,7 +3897,7 @@ 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:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3531,55 +3907,55 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3589,372 +3965,377 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 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:3397
+#: g10/keyedit.c:3398
 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:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 #, 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:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 #, fuzzy
 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:3520
+#: g10/keyedit.c:3521
 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:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 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:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, 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:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   al��rva %08lX �ltal %s%s%s id�pontban.\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 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:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, 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:4858
+#: g10/keyedit.c:4859
 #, 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:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "%c%lu preferencia k�tszer szerepel!\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, 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:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "Sima al��r�st �rok.\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "�nal��r�st �rok.\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkos�t�sa"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsm�retet szeretne? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3970,7 +4351,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3986,40 +4367,40 @@ msgstr ""
 "      <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:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4027,12 +4408,12 @@ 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:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4049,44 +4430,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, 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:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4097,7 +4478,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
 
@@ -4112,24 +4493,24 @@ msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4137,12 +4518,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4154,7 +4535,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4166,50 +4547,50 @@ msgstr ""
 "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:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, 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:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 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:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4219,51 +4600,51 @@ msgstr ""
 "k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, 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:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, 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:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "soha      "
 
@@ -4291,636 +4672,609 @@ msgstr "Al��r�s-jel�l�s: "
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "FIGYELEM: 2 bizalmas inform�ci�kat tartalmaz� �llom�ny van!\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s az eredeti p�ld�ny.\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s az �j p�ld�ny.\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 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:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, 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:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Kulcskarik�t l�trehoztam.\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s titkos�tott munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilv�nos kulcs: %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkos�tott adatot felt�telezek.\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "Visszafejt�s rendben.\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 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:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti f�jln�v: '%.*s'.\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 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:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, 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:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 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:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nem megval�s�tott rejtjelez� algoritmus"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = tov�bbi inform�ci�kat k�rek\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opci�: \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "\"%s\" �llom�ny l�tezik. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ismeretlen v�gz�d�s.\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "�rja be az �j �llom�nynevet"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "�rok a szabv�nyos kimenetre.\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, 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:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "\"%s\" �j konfigur�ci�s �llom�nyt l�trehoztam.\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: K�nyvt�rat l�trehoztam.\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 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:1157
+#: g10/parse-packet.c:1211
 #, 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:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "Probl�ma van az �gyn�kkel. Letiltom a haszn�lat�t.\n"
@@ -4990,7 +5344,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5004,39 +5358,35 @@ msgstr ""
 "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:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Adja meg egy JPEG f�jl nev�t a fot�azonos�t�hoz: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" nem JPEG �llom�ny.\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ez a fot� megfelel� (i/N/k)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
 
@@ -5320,61 +5670,56 @@ 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:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "K�l�n�ll� al��r�s.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "Olvasom a szabv�nyos bemenetet...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "Nincs al��rt adat.\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, 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:104
+#: g10/pubkey-enc.c:107
 #, 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:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Rendben, mi vagyunk az anonim c�mzett.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 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:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, 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:302
+#: g10/pubkey-enc.c:305
 #, 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:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
@@ -5496,149 +5841,149 @@ msgstr "(Nincs le�r�s.)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Ez �gy rendben van? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, 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:72
+#: g10/seckey-cert.c:74
 #, 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:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "�rv�nytelen jelsz�. Pr�b�lja �jra"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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:366
+#: g10/seckey-cert.c:406
 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/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "Gyenge kulcs j�tt l�tre. �jrapr�b�lom.\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, 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:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "FIGYELEM: Al��r�skivonat-konfliktus az �zenetben.\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, 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:113
+#: g10/sig-check.c:119
 #, 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:181
+#: g10/sig-check.c:191
 #, 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:182
+#: g10/sig-check.c:192
 #, 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:193
+#: g10/sig-check.c:203
 #, 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:195
+#: g10/sig-check.c:205
 #, 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:205
+#: g10/sig-check.c:215
 #, 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:287
+#: g10/sig-check.c:298
 #, 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:544
+#: g10/sig-check.c:560
 #, 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:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5647,7 +5992,7 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5667,12 +6012,12 @@ msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5680,41 +6025,41 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 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:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\"-t kihagytam: m�sodp�ld�ny.\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5774,51 +6119,51 @@ msgstr "Olvas�si hiba: %s.\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis %lu. rekord: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "Bizalmi adatb�zis tranzakci�ja t�l nagy.\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: K�nyvt�r nem l�tezik!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Nem siker�lt verzi�rekordot l�trehoznom: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: �rv�nytelen bizalmi adatb�zis j�tt l�tre.\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
@@ -5827,78 +6172,78 @@ msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "MEGJEGYZ�S: Bizalmi adatb�zis nem �rhat�.\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �rv�nytelen bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord friss�t�sekor: %s.\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: Nem bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: Verzi�rekord, rekordsz�m: %lu.\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, 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:1459
+#: g10/tdbio.c:1452
 #, 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:1504
+#: g10/tdbio.c:1497
 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"
 
@@ -5907,7 +6252,7 @@ msgstr "Bizalmi adatb�zis s�r�lt. K�rem, futtassa: \"gpg --fix-trustdb\".\n"
 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:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
@@ -6076,7 +6421,7 @@ msgstr ""
 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:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6086,345 +6431,1604 @@ msgstr ""
 "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:192
+#: g10/verify.c:195
 #, 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"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "�ltal�nos hiba"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "ismeretlen csomagt�pus"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "ismeretlen verzi�"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "ismeretlen nyilv�nos kulcs� algoritmus"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "ismeretlen kivonatol� algoritmus"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "rossz nyilv�nos kulcs"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "rossz titkos kulcs"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "rossz al��r�s"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "hib�s ellen�rz��sszeg"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "rossz jelsz�"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "nyilv�nos kulcs nem tal�lhat�"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "ismeretlen rejtjelez� algoritmus"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "nem lehet megnyitni a kulcskarik�t"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "�rv�nytelen csomag"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "�rv�nytelen p�nc�l"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "nincs ilyen felhaszn�l�i azonos�t�"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "titkos kulcs nem �ll rendelkez�sre"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "rossz titkos kulcs haszn�lata"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "nem t�mogatott"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "rossz kulcs"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "�llom�nyolvas�si hiba"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "�llom�ny�r�si hiba"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "ismeretlen t�m�r�t� algoritmus"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "�llom�nymegnyit�si hiba"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "�llom�nyl�trehoz�si hiba"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "�rv�nytelen jelsz�"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "nem megval�s�tott nyilv�nos kulcs� algoritmus"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "nem megval�s�tott rejtjelez� algoritmus"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "ismeretlen al��r�soszt�ly"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "hib�s bizalmi adatb�zis"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "hib�s MPI"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "er�forr�shat�r"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "�rv�nytelen kulcskarika"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "rossz igazol�s"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "rossz form�j� felhaszn�l�i azonos�t�"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "�llom�nyz�r�si hiba"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "�llom�ny�tnevez�si hiba"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "�llom�nyt�rl�si hiba"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "nem v�rt adat"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "id�b�lyeg-konfliktus"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "haszn�lhatatlan nyilv�nos kulcs� algoritmus"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "�llom�ny l�tezik"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "gyenge kulcs"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "�rv�nytelen argumentum"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "rossz URI"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "nem t�mogatott URI"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "h�l�zati hiba"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "nem titkos�tott"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "nem feldolgozott"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "haszn�lhatatlan nyilv�nos kulcs"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "haszn�lhatatlan titkos kulcs"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "kulcsszerverhiba"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "M�gsem"
+msgid "do not use the internal CCID driver"
+msgstr "ne haszn�lja a termin�lt egy�ltal�n"
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "nem titkos�tott"
+msgid "allow the use of admin card commands"
+msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "Nincs al��rt adat.\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "Ez egy programhiba... (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "igen"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "iI"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "rossz igazol�s"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Kulcs tal�lhat�: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "visszavon�si igazol�s k�sz�t�se"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Ez a kulcs lej�rt!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "megmutatja az ujjlenyomatot"
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "al��r�s ellen�rz�se"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "nem"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "Ismeretlen m�d�"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+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"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Ez nem �rv�nyes e-mail c�m.\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Kulcsgener�l�s sikertelen: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "Visszavon� igazol�s l�trehozva.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "%c%lu preferencia k�tszer szerepel!\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(Nincs le�r�s.)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "�rok a \"%s\" �llom�nyba.\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[f�jl]|al��r�s k�sz�t�se"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "titkos kulcsok list�z�sa"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "rossz igazol�s"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "rossz igazol�s"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "rossz igazol�s"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "jelsz�v�ltoztat�s"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "alap�rt. kulcs haszn. alap�rt. c�mzettk�nt"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "ne haszn�lja a termin�lt egy�ltal�n"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "3-as verzi�j� al��r�sok er�ltet�se"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "mindig haszn�ljon MDC-t titkos�t�skor"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "k�tegelt m�d: soha nem k�rdez"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "titkoskulcs-karika hozz�ad�sa a list�hoz"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|f�jl|b�v�t� modul bet�lt�se"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|N. sorsz�m� t�m�r�t� algoritmus haszn�lata"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\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"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "Haszn�lat: gpg [opci�k] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "�rok a \"%s\" �llom�nyba.\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "     �sszesen feldolgoztam: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "visszavon�si igazol�s k�sz�t�se"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Az al��r�s lej�rt: %s.\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "J� al��r�s a k�vetkez�t�l: \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "               azaz \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "kil�p�s|kilepes"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "kK"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "A sor t�l hossz�!\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "FIGYELEM: Nem biztons�gos mem�ri�t haszn�lunk!\n"
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "Al��r�s sikertelen: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: util/secmem.c:98
-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"
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "Haszn�lat: gpg [opci�k] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "nyilv�nos kulcs nem tal�lhat�"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Parancsok:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "Visszafejt�s rendben.\n"
 
-#: util/secmem.c:351
-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"
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "Visszafejt�s rendben.\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [f�jln�v]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "Nem tudom megnyitni %s-t: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "%s nem hozhat� l�tre: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "%s nem hozhat� l�tre: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "Friss�t�s sikertelen: %s.\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "Friss�t�s sikertelen: %s.\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "Friss�t�s sikertelen: %s.\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "Friss�t�s sikertelen: %s.\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+
+#, fuzzy
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
+
+#~ 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"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "Nem tudom megnyitni %s-t!\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "Nem tudom a stat m�veletet elv�gezni a(z) \"%s\" �llom�nyon: %s.\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "\"%s\" nem szab�lyos �llom�ny. Figyelmen k�v�l hagyom.\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr ""
+#~ "Megjegyz�s: random_seed �llom�ny (v�letlensz�m-gener�tor �llapota) �res.\n"
+
+#~ 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"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "Nem tudom �rni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "FIGYELEM: Nem biztons�gos v�letlensz�m-gener�tort haszn�lok!!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "Tov�bbi inform�ci�t a http://www.gnupg.org/why-not-idea.html oldalon "
-#~ "tal�l.\n"
+#~ "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"
+
+#~ 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"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "\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 ""
-#~ "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, "
-#~ "�s = jellel kell befejez�dj�n.\n"
+#~ "\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"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "titkos kulcs nem �ll rendelkez�sre"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
+
+#~ msgid "general error"
+#~ msgstr "�ltal�nos hiba"
 
-#~ 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"
+#~ msgid "unknown packet type"
+#~ msgstr "ismeretlen csomagt�pus"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
+#~ msgid "unknown version"
+#~ msgstr "ismeretlen verzi�"
 
-#~ msgid "not human readable"
-#~ msgstr "nem olvashat� forma"
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "ismeretlen nyilv�nos kulcs� algoritmus"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "ismeretlen kivonatol� algoritmus"
+
+#~ msgid "bad public key"
+#~ msgstr "rossz nyilv�nos kulcs"
+
+#~ msgid "bad secret key"
+#~ msgstr "rossz titkos kulcs"
+
+#~ msgid "bad signature"
+#~ msgstr "rossz al��r�s"
+
+#~ msgid "checksum error"
+#~ msgstr "hib�s ellen�rz��sszeg"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "ismeretlen rejtjelez� algoritmus"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "nem lehet megnyitni a kulcskarik�t"
+
+#~ msgid "invalid packet"
+#~ msgstr "�rv�nytelen csomag"
+
+#~ msgid "invalid armor"
+#~ msgstr "�rv�nytelen p�nc�l"
+
+#~ msgid "no such user id"
+#~ msgstr "nincs ilyen felhaszn�l�i azonos�t�"
+
+#~ msgid "secret key not available"
+#~ msgstr "titkos kulcs nem �ll rendelkez�sre"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "rossz titkos kulcs haszn�lata"
+
+#~ msgid "not supported"
+#~ msgstr "nem t�mogatott"
+
+#~ msgid "bad key"
+#~ msgstr "rossz kulcs"
+
+#~ msgid "file read error"
+#~ msgstr "�llom�nyolvas�si hiba"
+
+#~ msgid "file write error"
+#~ msgstr "�llom�ny�r�si hiba"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "ismeretlen t�m�r�t� algoritmus"
+
+#~ msgid "file open error"
+#~ msgstr "�llom�nymegnyit�si hiba"
+
+#~ msgid "file create error"
+#~ msgstr "�llom�nyl�trehoz�si hiba"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "�rv�nytelen jelsz�"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "nem megval�s�tott nyilv�nos kulcs� algoritmus"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "nem megval�s�tott rejtjelez� algoritmus"
+
+#~ msgid "unknown signature class"
+#~ msgstr "ismeretlen al��r�soszt�ly"
+
+#~ msgid "trust database error"
+#~ msgstr "hib�s bizalmi adatb�zis"
+
+#~ msgid "resource limit"
+#~ msgstr "er�forr�shat�r"
+
+#~ msgid "invalid keyring"
+#~ msgstr "�rv�nytelen kulcskarika"
+
+#~ msgid "malformed user id"
+#~ msgstr "rossz form�j� felhaszn�l�i azonos�t�"
+
+#~ msgid "file close error"
+#~ msgstr "�llom�nyz�r�si hiba"
+
+#~ msgid "file rename error"
+#~ msgstr "�llom�ny�tnevez�si hiba"
+
+#~ msgid "file delete error"
+#~ msgstr "�llom�nyt�rl�si hiba"
+
+#~ msgid "unexpected data"
+#~ msgstr "nem v�rt adat"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "id�b�lyeg-konfliktus"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "haszn�lhatatlan nyilv�nos kulcs� algoritmus"
+
+#~ msgid "file exists"
+#~ msgstr "�llom�ny l�tezik"
+
+#~ msgid "weak key"
+#~ msgstr "gyenge kulcs"
+
+#~ msgid "invalid argument"
+#~ msgstr "�rv�nytelen argumentum"
+
+#~ msgid "bad URI"
+#~ msgstr "rossz URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "nem t�mogatott URI"
+
+#~ msgid "network error"
+#~ msgstr "h�l�zati hiba"
+
+#~ msgid "not encrypted"
+#~ msgstr "nem titkos�tott"
+
+#~ msgid "not processed"
+#~ msgstr "nem feldolgozott"
+
+#~ msgid "unusable public key"
+#~ msgstr "haszn�lhatatlan nyilv�nos kulcs"
+
+#~ msgid "unusable secret key"
+#~ msgstr "haszn�lhatatlan titkos kulcs"
+
+#~ msgid "keyserver error"
+#~ msgstr "kulcsszerverhiba"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "nem titkos�tott"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "Nincs al��rt adat.\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "Ez egy programhiba... (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "FIGYELEM: Nem biztons�gos mem�ri�t haszn�lunk!\n"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
+
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6462,10 +8066,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
-
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "Rossz jelsz� vagy ismeretlen rejtjelez� algoritmus (%d).\n"
 
@@ -6479,18 +8079,9 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ 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"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "A jelsz� t�l hossz�!\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "�rv�nytelen v�lasz az �gyn�kt�l!\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "N. m�sodlagos kulcs kiv�laszt�sa"
 
@@ -6736,20 +8327,9 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ "Ez a rejtjelez� algoritmus nem aj�nlott. K�rem, haszn�ljon "
 #~ "szabv�nyosabbat!\n"
 
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "�rok a \"%s\" �llom�nyba.\n"
-
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "Sajn�lom, ezt nem tudom megcsin�lni k�tegelt m�dban!\n"
 
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
-
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
@@ -6795,9 +8375,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "FIGYELEM: \"%s\" �res �llom�ny.\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "Nem tudom megnyitni %s-t: %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
 #~ msgstr " %d = r�szlegesen megb�zom benne\n"
@@ -6834,9 +8411,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: Nem tudom l�trehozni: %s.\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: Nem tudom a k�nyvt�rat l�trehozni: %s.\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr ""
 #~ "Ha m�gis haszn�lni akarja ezt a visszavont kulcsot,\n"
@@ -6845,9 +8419,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "Nem tudom megnyitni a \"%s\" fot�t: %s.\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "Hiba: Hi�nyz� kett�spont.\n"
 
@@ -6865,9 +8436,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- Hamis visszavon�st tal�ltam!\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [lej�r: %s]"
@@ -6879,9 +8447,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "[visszavont] "
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "%s nem hozhat� l�tre: %s\n"
-
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
@@ -6921,18 +8486,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ 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"
 
@@ -6942,48 +8495,18 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ 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 "|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 "|[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"
 
@@ -7002,15 +8525,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ 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"
 
@@ -7060,9 +8574,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\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"
 
diff --git a/po/id.po b/po/id.po
index 1e8ff5d24..7ab244e79 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -16,297 +16,722 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: cipher/primegen.c:121
+#: agent/call-pinentry.c:193
 #, 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"
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "modul entropi gathering tidak terdeteksi\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "baris terlalu panjang\n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "tidak dapat membuka `%s'\n"
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "passphrase terlalu panjang\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Karakter tidak valid dalam nama\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "MPI yang buruk"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "passphrase yang buruk"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "passphrase yang buruk"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "menulis kunci rahasia ke `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "algoritma proteksi %d%s tidak didukung\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "tidak dapat melakukan statistik `%s': %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "'%s' bukan file reguler - diabaikan\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "catatan: file random_seed kosong\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "tidak dapat membaca `%s': %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "gagal menghapus keyblok: %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "catatan: file random_seed tidak diupdate\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "tidak dapat membuat %s: %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "tidak dapat menulis `%s': %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "tidak dapat menutup `%s': %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
+#: agent/divert-scd.c:217
+msgid "Admin PIN"
+msgstr ""
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Ulangi passphrase: "
+
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "passphrase tidak diulang dengan benar; coba lagi"
+
+#: agent/divert-scd.c:290
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
-"Random number generator yang digunakan tidak aman,\n"
-"ia bukanlah RNG yang kuat!\n"
-"\n"
-"JANGAN MENGGUNAKAN DATA YANG DIHASILKAN PROGRAM INI!!\n"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: cipher/rndegd.c:202
-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"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "ubah passphrase"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 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/rndlinux.c:132
-#, c-format
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "ubah passphrase"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"\n"
-"Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
-"memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
+"@\n"
+"Pilihan:\n"
+"  "
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "gagal inisialisasi TrustDB: %s\n"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "gagal membuat kembali cache keyring: %s\n"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "gagal menghapus keyblok: %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "detil"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "lebih diam"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|muat modul ekstensi FILE"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "cari kunci di key server"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "Perbarui preferensi untuk user ID terpilih?"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "perbarui database trust"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Laporkan bug ke <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
+msgstr ""
+
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "Pengiriman keyserver gagal: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "file pilihan `%s': %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "membaca pilihan dari `%s'\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "kesalahan penciptaan : `%s': %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "tidak dapat membuat direktori `%s': %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "tidak dapat membuat %s: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "kesalahan mengirim ke `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "gagal memperbarui: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "menulis kunci rahasia ke `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: direktori tercipta\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: tidak dapat membuat direktori: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "gagal perbarui rahasia: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: dilewati: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "gagal membaca keyblock: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: kesalahan membaca record bebas: %s\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' sudah dikompresi\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "buat sepasang kunci baru"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "passphrase yang buruk"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "Batal"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "kunci '%s' tidak ditemukan: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "bagian kunci rahasia tidak tersedia\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "kesalahan pembacaan: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "gagal inisialisasi TrustDB: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "gagal menghapus keyblok: %s\n"
+msgid "Yes"
+msgstr "y|ya"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Pembuatan kunci gagal: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "tidak dapat membuka file: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s signature, algoritma digest %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "kesalahan penciptaan : `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[User id tidak ditemukan]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "tidak dapat terkoneksi ke `%s': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "masalah komunikasi dengan gpg-agent\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "dibatalkan oleh user\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "tidak dapat meniadakan core dump: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "y|ya"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "n|t|tidak"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "tT"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "q|k|keluar"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "kK"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "tidak ditemukan data OpenPGP yang valid.\n"
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: g10/armor.c:320
 #, c-format
@@ -385,176 +810,213 @@ msgstr ""
 "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
 "mengandung bug\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
+"dan diakhiri dengan sebuah '='\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "tidak dapat dibaca manusia"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -562,207 +1024,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "kunci rahasia tidak tersedia"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "gagal menghapus keyblok: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr ""
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr ""
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Ulangi passphrase: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "passphrase tidak diulang dengan benar; coba lagi"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output tidak berfungsi untuk perintah ini\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -805,225 +1215,259 @@ msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "menggunakan cipher %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, 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/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "masalah menangani paket terenkripsi\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "tidak ada eksekusi program remote yang didukung\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "tidak dapat membuat direktori `%s': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "platform ini membutuhkan file temp ketika memanggil program eksternal\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "program eksternal berhenti secara tidak natual\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "tidak dapat mengeksekusi program eksternal\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "tidak dapat membaca tanggapan program eksternal: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "kunci rahasia tidak dapat dipakai"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, 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:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, 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:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[User id tidak ditemukan]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, fuzzy, c-format
+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:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
+
+#: g10/getkey.c:2659
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1031,128 +1475,129 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1162,51 +1607,47 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "detil"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1214,7 +1655,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1234,15 +1675,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1252,7 +1693,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1260,645 +1701,586 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, 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/gpg.c:1285
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, 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/gpg.c:1297
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "file pilihan `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "membaca pilihan dari `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 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/gpg.c:2988
+#: g10/gpg.c:3012
 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, fuzzy, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, fuzzy, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, 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/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, 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/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[User id tidak ditemukan]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, fuzzy, c-format
-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:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
-
-#: g10/getkey.c:2658
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "lebih diam"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "mengambil kunci ini dari keyring"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1906,7 +2288,7 @@ msgstr ""
 "Sintaks: gpg [options] [files]\n"
 "Periksa signature terhadap kunci terpercaya\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1918,7 +2300,7 @@ msgstr ""
 "ada\n"
 "kaitan dengan (membuat secara implisit) web-of-certificates."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1930,16 +2312,16 @@ msgstr ""
 "akses ke kunci rahasia.  Jawab \"yes\" untuk menset kunci ini ke\n"
 "sangat dipercaya\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1953,7 +2335,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1964,16 +2346,16 @@ msgstr ""
 "mengenkripsi.  Algoritma ini seharusnya digunakan dalam domain tertentu.\n"
 "Silakan berkonsultasi dulu dengan ahli keamanan anda."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Masukkan ukuran kunci"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Jawab \"ya\" atau \"tidak\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1985,19 +2367,19 @@ msgstr ""
 "tidak akan mendapat respon kesalahan yang baik - sebaiknya sistem akan\n"
 "berusaha menginterprestasi nilai yang diberikan sebagai sebuah interval."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Masukkan nama pemegang kunci"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "silakan masukkan alamat email (pilihan namun sangat dianjurkan)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Silakan masukkan komentar tambahan"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2011,11 +2393,11 @@ msgstr ""
 "O  untuk melanjutkan dengan pembuatan kunci.\n"
 "K  untuk menghentikan pembuatan kunci."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2093,12 +2475,12 @@ msgstr ""
 "\n"
 "Jika anda tidak tahu jawaban yang tepat, jawab \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Jawab \"ya\" jika anda ingin menandai seluruh ID user"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2106,11 +2488,11 @@ msgstr ""
 "Jawab \"ya\" jika anda benar-benar ingin menghapus ID user ini.\n"
 "Seluruh sertifikat juga akan hilang!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Jawab \"ya\" jika ingin menghapus subkey"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2120,7 +2502,7 @@ msgstr ""
 "signature ini karena mungkin penting membangun koneksi trust ke kunci atau\n"
 "ke kunci tersertifikasi lain dengan kunci ini."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2132,7 +2514,7 @@ msgstr ""
 "kunci yang digunakan karena kunci penanda ini mungkin membangun suatu\n"
 "koneksi trust melalui kunci yang telah tersertifikasi lain."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2140,7 +2522,7 @@ msgstr ""
 "Signature tidak valid.  Adalah hal yang masuk akal untuk menghapusnya dari\n"
 "keyring anda"
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2154,7 +2536,7 @@ msgstr ""
 "ini bila self-signature untuk beberapa alasan tidak valid dan\n"
 "tersedia yang kedua."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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"
@@ -2164,24 +2546,24 @@ msgstr ""
 "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
 "yang terpengaruh akan bertambah satu detik.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "Beri nama file tempat berlakunya signature"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Jawab \"ya\" jika tidak apa-apa menimpa file"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2189,7 +2571,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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2219,7 +2601,7 @@ msgstr ""
 "      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
 "lagi.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2229,11 +2611,11 @@ msgstr ""
 "mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n"
 "Baris kosong mengakhiri teks.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Tidak tersedia bantuan"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
@@ -2269,495 +2651,490 @@ msgstr "kunci rahasia tidak dapat dipakai"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            tidak diimpor: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Anda telah menandai ID user ini:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, fuzzy, c-format
 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:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, fuzzy, c-format
 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, 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:1276
+#: g10/import.c:1275
 #, 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:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, 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:1389
+#: g10/import.c:1388
 #, fuzzy, c-format
 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:1391
+#: g10/import.c:1390
 #, fuzzy, c-format
 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:1409
+#: g10/import.c:1408
 #, 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:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, 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:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, 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:1802
+#: g10/import.c:1801
 #, 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:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2770,63 +3147,63 @@ msgstr ""
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Saya cukup percaya\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Saya sangat percaya\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2835,11 +3212,11 @@ msgstr ""
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 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:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2848,13 +3225,13 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2863,43 +3240,43 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Apakah anda ingin menandainya lagi? (y/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2907,11 +3284,11 @@ msgstr ""
 "Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
 "dalam mode --pgp2\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2921,32 +3298,32 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, 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:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2955,100 +3332,100 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3056,11 +3433,11 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3068,206 +3445,206 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3275,241 +3652,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3517,19 +3894,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3537,7 +3914,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:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3547,55 +3924,55 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3605,375 +3982,380 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 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"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 #, 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:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 #, fuzzy
 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, 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:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3989,7 +4371,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4005,40 +4387,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4046,12 +4428,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4067,44 +4449,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4114,7 +4496,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
 
@@ -4129,23 +4511,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4153,12 +4535,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4171,7 +4553,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4183,50 +4565,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4236,50 +4618,50 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, 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:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, 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:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "tidak pernah..."
 
@@ -4307,626 +4689,599 @@ msgstr "Notasi signature: "
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaiki kemungkinan lubang keamanan ini\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memeriksa keyring `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "tidak dapat meniadakan core dump: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritma cipher belum diimplementasikan"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "File `%s' ada. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffix tidak dikenal\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Masukkan nama file baru"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "file konfigurasi baru `%s' tercipta\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: direktori tercipta\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "protokol gpg-agent versi %d tidak didukung\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "tidak dapat terkoneksi ke `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
@@ -4992,7 +5347,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5008,39 +5363,35 @@ msgstr ""
 "gambar yang sangat besar, kunci anda akan menjadi semakin besar pula!\n"
 "Jagalah agar gambar mendekati ukuran 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Masukkan nama file JPEG sebagai ID foto: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" bukan sebuah file JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Apakah foto ini benar (y/N/q)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "tidak dapat menampilkan photo ID!\n"
 
@@ -5322,61 +5673,56 @@ msgstr "tidak ada alamat yang valid\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "kesalahan penciptaan : `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Menghapus signature.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, 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:302
+#: g10/pubkey-enc.c:305
 #, 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:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
@@ -5501,149 +5847,149 @@ msgstr "(Tidak diberikan deskripsi)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Ini oke? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase tidak valid; silakan coba lagi"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan ubah passphrase lagi.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "membuat checksum 16-bit terdepresiasi untuk proteksi kunci rahasia\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "kunci lemah tercipta - mengulang\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 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:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "Peringatan: konflik digest signature dalam pesan\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "PERINGATAN: subkey penanda tangan %08lX memiliki sertifikasi silang yang "
 "tidak valid\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 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:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 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:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "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:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "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:205
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, 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:544
+#: g10/sig-check.c:560
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5651,7 +5997,7 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5670,54 +6016,54 @@ msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
 "palsu!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "lewati `%s': terduplikasi\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5777,51 +6123,51 @@ msgstr "kesalahan pembacaan: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "transaksi trustdb terlalu besar\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: tercipta trustdb tidak valid\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
@@ -5830,78 +6176,78 @@ msgstr "%s: tercipta trustdb\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
@@ -5910,7 +6256,7 @@ msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
@@ -6078,7 +6424,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6088,346 +6434,1603 @@ msgstr ""
 "Tolong ingat bahwa file signature (.sig atau .asc)\n"
 "haruslah file pertama yang diberikan pada perintah baris.\n"
 
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "Kesalahan umum"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "tipe paket tidak dikenal"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "versi tidak dikenal"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "tidak dapat membuka file: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "algoritma pubkey tidak dikenal"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "gagal enarmoring: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "algoritma digest tidak dikenal"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "kunci publik yang buruk"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "kunci rahasia yang buruk"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "signature yang buruk"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "kesalahan checksum"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "passphrase yang buruk"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "kunci publik tidak ditemukan"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "algoritma cipher tidak dikenal"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "tidak dapat membuka keyring"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "paket tidak valid"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "gagal menghapus keyblok: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "armor tidak valid"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "tidak ada user id tsb"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "kunci rahasia tidak tersedia"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "digunakan kunci rahasia yang salah"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "tidak didukung"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "kunci yang buruk"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "kesalahan baca file"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "kesalahan tulis file"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "algoritma kompresi tidak dikenal"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "kesalahan buka file"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "kesalahan buat file"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "passphrase tidak valid"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algoritma pubkey belum diimplementasikan"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "algoritma cipher belum diimplementasikan"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "kelas signature tidak dikenal"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "gagal membaca keyblock: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "kesalahan database trust"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "MPI yang buruk"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' sudah dikompresi\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "batasan sumber daya"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "keyring tidak valid"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "buat sepasang kunci baru"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "sertifikat yang buruk"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "user id yang tidak benar"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "kesalahan tutup file"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "kesalahan ganti nama file"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "kesalahan hapus file"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "data tidak terduga"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "konflik timestamp"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "gagal menghapus keyblok: %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "algoritma pubkey tidak dapat digunakan"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Pembuatan kunci gagal: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "file ada"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "kunci lemah"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s signature, algoritma digest %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "argumen tidak valid"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "URI yang buruk"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "URI tidak didukung"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "kesalahan jaringan"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "tidak dienkripsi"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "tidak diproses"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "membaca pilihan dari `%s'\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "kunci publik tidak dapat dipakai"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "kunci rahasia tidak dapat dipakai"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "kesalahan keyserver"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "Batal"
+msgid "do not use the internal CCID driver"
+msgstr "jangan menggunakan terminal"
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "tidak dienkripsi"
+msgid "allow the use of admin card commands"
+msgstr "perintah saling konflik\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "tidak ada data tertandai\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:1008
+#, c-format
+msgid "handler for fd %d started\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... kesalahan (%s:%d:%s)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
+
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: util/logger.c:230
+#: sm/call-dirmngr.c:182
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "anda menemukan kesalahan ...(%s:%d)\n"
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "y|ya"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "yY"
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "protokol gpg-agent versi %d tidak didukung\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "tidak dapat membuka `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "menulis kunci rahasia ke `%s'\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "gagal inisialisasi TrustDB: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "CATATAN: kunci telah dibatalkan"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "sertifikat yang buruk"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Kunci tersedia di:"
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "Gagal memeriksa signature yang dibuat: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "buat sertifikat revokasi"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Kunci ini telah berakhir!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "tampilkan fingerprint"
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "Gagal memeriksa signature yang dibuat: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "verifikasi signature"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "n|t|tidak"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "tT"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "tidak dikenal"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "kesalahan: fingerprint tidak valid\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "kesalahan: fingerprint tidak valid\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Anda perlu passphrase untuk membuka kunci rahasia untuk user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, tercipta %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "algoritma hash tidak valid `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Bukan alamat email yang valid\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Pembuatan kunci gagal: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "kunci '%s' tidak ditemukan: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "gagal membaca keyblock: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "Sertifikat pembatalan tercipta.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "preferensi %c%lu ganda \n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "gagal menghapus keyblok: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(Tidak diberikan deskripsi)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "menulis ke `%s'\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[file]|buat signature"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[file]|buat signature teks"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "tampilkan kunci rahasia"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "sertifikat yang buruk"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "hapus kunci dari keyring publik"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "sertifikat yang buruk"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "sertifikat yang buruk"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "ubah passphrase"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "ciptakan output ascii"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "gunakan kunci baku sebagai penerima baku"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "jangan menggunakan terminal"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "paksa signature v3"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "selalu gunakan MDC untuk enkripsi"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "mode batch: tanpa tanya"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "asumsikan ya untuk seluruh pertanyaan"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "asumsikan tidak untuk seluruh pertanyaan"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "tambah keyring ini ke daftar keyring"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "tambah keyring rahasia ini ke daftar"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NAMA|set charset terminal ke NAMA"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|FILE|muat modul ekstensi FILE"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAMA|gunakan algoritma cipher NAMA"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|gunakan algoritma kompresi N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sintaks: gpg [pilihan] [file]\n"
+"tandai, cek, enkripsi atau dekripsi\n"
+"operasi baku tergantung pada data input\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "pemakaian: gpg [pilihan] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "tidak dapat terkoneksi ke `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "menulis ke `%s'\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "tidak dapat menutup `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Jumlah yang telah diproses: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "buat sertifikat revokasi"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "%s: keyring tercipta\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "gagal inisialisasi TrustDB: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "gagal inisialisasi TrustDB: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? masalah memeriksa pembatalan: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "kesalahan: fingerprint tidak valid\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "Gagal memeriksa signature yang dibuat: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Signature kadaluwarsa %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Signature baik dari \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "              alias \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "q|k|keluar"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "kK"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "baris terlalu panjang\n"
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
 msgstr ""
-"silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "gagal menandai: %s\n"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "gagal menghapus keyblok: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "kesalahan mengirim ke `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "kesalahan mengirim ke `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "pemakaian: gpg [pilihan] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "kunci publik tidak ditemukan"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Perintah:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "dekripsi lancar\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "dekripsi lancar\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [namafile]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s tidak dibolehkan dengan %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "tidak dapat membuka file: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "tidak dapat membuat direktori `%s': %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "tidak dapat membuka %s: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "tidak ada eksekusi program remote yang didukung\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "tidak dapat membuat %s: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "tidak dapat membuat %s: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "gagal memperbarui: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "gagal menghapus keyblok: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "gagal memperbarui: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "gagal memperbarui: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "gagal memperbarui: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "tidak dapat membuat %s: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "tidak dapat membuat %s: %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "algoritma proteksi %d%s tidak didukung\n"
+
+#, fuzzy
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "modul entropi gathering tidak terdeteksi\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "tidak dapat membuka `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "menulis kunci rahasia ke `%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "tidak dapat melakukan statistik `%s': %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "'%s' bukan file reguler - diabaikan\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "catatan: file random_seed kosong\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "tidak dapat membaca `%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "catatan: file random_seed tidak diupdate\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "tidak dapat menulis `%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "tidak dapat menutup `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "silakan lihat http://www.gnupg.org/why-not-idea.html untuk informasi "
-#~ "lebih lanjut\n"
+#~ "Random number generator yang digunakan tidak aman,\n"
+#~ "ia bukanlah RNG yang kuat!\n"
+#~ "\n"
+#~ "JANGAN MENGGUNAKAN DATA YANG DIHASILKAN PROGRAM INI!!\n"
+#~ "\n"
+
+#~ 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"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "\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 ""
-#~ "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau "
-#~ "spasi, dan diakhiri dengan sebuah '='\n"
+#~ "\n"
+#~ "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
+#~ "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "kunci rahasia tidak tersedia"
+
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Anda telah menandai ID user ini:\n"
+
+#~ msgid "general error"
+#~ msgstr "Kesalahan umum"
+
+#~ msgid "unknown packet type"
+#~ msgstr "tipe paket tidak dikenal"
+
+#~ msgid "unknown version"
+#~ msgstr "versi tidak dikenal"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "algoritma pubkey tidak dikenal"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "algoritma digest tidak dikenal"
+
+#~ msgid "bad public key"
+#~ msgstr "kunci publik yang buruk"
+
+#~ msgid "bad secret key"
+#~ msgstr "kunci rahasia yang buruk"
+
+#~ msgid "bad signature"
+#~ msgstr "signature yang buruk"
+
+#~ msgid "checksum error"
+#~ msgstr "kesalahan checksum"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "algoritma cipher tidak dikenal"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "tidak dapat membuka keyring"
+
+#~ msgid "invalid packet"
+#~ msgstr "paket tidak valid"
+
+#~ msgid "invalid armor"
+#~ msgstr "armor tidak valid"
+
+#~ msgid "no such user id"
+#~ msgstr "tidak ada user id tsb"
+
+#~ msgid "secret key not available"
+#~ msgstr "kunci rahasia tidak tersedia"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "digunakan kunci rahasia yang salah"
+
+#~ msgid "not supported"
+#~ msgstr "tidak didukung"
+
+#~ msgid "bad key"
+#~ msgstr "kunci yang buruk"
+
+#~ msgid "file read error"
+#~ msgstr "kesalahan baca file"
+
+#~ msgid "file write error"
+#~ msgstr "kesalahan tulis file"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "algoritma kompresi tidak dikenal"
+
+#~ msgid "file open error"
+#~ msgstr "kesalahan buka file"
+
+#~ msgid "file create error"
+#~ msgstr "kesalahan buat file"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "passphrase tidak valid"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algoritma pubkey belum diimplementasikan"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "algoritma cipher belum diimplementasikan"
+
+#~ msgid "unknown signature class"
+#~ msgstr "kelas signature tidak dikenal"
+
+#~ msgid "trust database error"
+#~ msgstr "kesalahan database trust"
+
+#~ msgid "resource limit"
+#~ msgstr "batasan sumber daya"
+
+#~ msgid "invalid keyring"
+#~ msgstr "keyring tidak valid"
+
+#~ msgid "malformed user id"
+#~ msgstr "user id yang tidak benar"
+
+#~ msgid "file close error"
+#~ msgstr "kesalahan tutup file"
+
+#~ msgid "file rename error"
+#~ msgstr "kesalahan ganti nama file"
+
+#~ msgid "file delete error"
+#~ msgstr "kesalahan hapus file"
+
+#~ msgid "unexpected data"
+#~ msgstr "data tidak terduga"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "konflik timestamp"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "algoritma pubkey tidak dapat digunakan"
+
+#~ msgid "file exists"
+#~ msgstr "file ada"
+
+#~ msgid "weak key"
+#~ msgstr "kunci lemah"
+
+#~ msgid "invalid argument"
+#~ msgstr "argumen tidak valid"
+
+#~ msgid "bad URI"
+#~ msgstr "URI yang buruk"
+
+#~ msgid "unsupported URI"
+#~ msgstr "URI tidak didukung"
+
+#~ msgid "network error"
+#~ msgstr "kesalahan jaringan"
+
+#~ msgid "not encrypted"
+#~ msgstr "tidak dienkripsi"
+
+#~ msgid "not processed"
+#~ msgstr "tidak diproses"
+
+#~ msgid "unusable public key"
+#~ msgstr "kunci publik tidak dapat dipakai"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
+#~ msgid "unusable secret key"
+#~ msgstr "kunci rahasia tidak dapat dipakai"
+
+#~ msgid "keyserver error"
+#~ msgstr "kesalahan keyserver"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "tidak dienkripsi"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
+#~ msgid "no data"
+#~ msgstr "tidak ada data tertandai\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... kesalahan (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
+#~ 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"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
-#~ msgid "not human readable"
-#~ msgstr "tidak dapat dibaca manusia"
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6465,10 +8068,6 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "kesalahan penciptaan passphrase: %s\n"
-
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "passphrase jelek atau algoritma cipher (%d) tidak dikenal\n"
 
@@ -6481,18 +8080,9 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "tidak dapat membuat server menulis FD untuk agen\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "masalah komunikasi dengan gpg-agent\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "passphrase terlalu panjang\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "respon tidak valid dari agen\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "pilih kunci sekunder N"
 
@@ -6739,20 +8329,9 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ msgstr ""
 #~ "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
 
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "menulis ke `%s'\n"
-
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "maaf, tidak dapat melakukan hal ini dalam mode batch\n"
 
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "kunci '%s' tidak ditemukan: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "tidak dapat membuat %s: %s\n"
-
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "tidak dapat membuka file: %s\n"
@@ -6798,9 +8377,6 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: PERINGATAN: file kosong\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "tidak dapat membuka %s: %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
 #~ msgstr " %d = Saya cukup percaya\n"
@@ -6837,18 +8413,12 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: tidak dapat membuat: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: tidak dapat membuat direktori: %s\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr "Jika anda ingin menggunakan kunci yang dibatalkan, jawab \"ya\"."
 
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "Tidak dapat membuka foto \"%s\":%s\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "tidak dapat membuka file: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "kesalahan: kurang tanda titik dua\n"
 
@@ -6864,9 +8434,6 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev - ditemukan pembatalan palsu\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? masalah memeriksa pembatalan: %s\n"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [berakhir: %s]"
@@ -6878,9 +8445,6 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "[revoked] "
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "tidak dapat membuat %s: %s\n"
-
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
@@ -6920,18 +8484,6 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ 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"
 
@@ -6941,48 +8493,18 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ 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 "|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 "|[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"
 
@@ -7001,15 +8523,6 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ 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"
 
@@ -7059,9 +8572,6 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\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"
 
diff --git a/po/it.po b/po/it.po
index 00132402a..a9a7e755c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -14,300 +14,722 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: agent/call-pinentry.c:193
 #, 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"
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "riga troppo lunga\n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "impossibile aprire `%s'\n"
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "passphrase troppo lunga\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Carattere non valido nel nome\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "MPI danneggiato"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "passphrase errata"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "passphrase errata"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "scrittura della chiave segreta in `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "l'algoritmo di protezione %d%s non � gestito\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "impossibile creare `%s': %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:458
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "impossibile eseguire stat su `%s': %s\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
+
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
+
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
+
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
+
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "errore scrivendo il portachiavi `%s': %s\n"
+
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' non � un file regolare - ignorato\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "nota: il file random_seed � vuoto\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
+#: agent/divert-scd.c:217
+msgid "Admin PIN"
 msgstr ""
-"ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "impossibile leggere `%s': %s\n"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Ripeti la passphrase: "
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "nota: il file random_seed non � stato aggiornato\n"
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: agent/divert-scd.c:290
 #, c-format
-msgid "can't create `%s': %s\n"
-msgstr "impossibile creare `%s': %s\n"
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr ""
 
-#: cipher/random.c:556 cipher/random.c:566
-#, c-format
-msgid "can't write `%s': %s\n"
-msgstr "impossibile scrivere su `%s': %s\n"
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
+"\n"
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "impossibile chiudere `%s': %s\n"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "cambia la passphrase"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 msgstr ""
-"ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:815
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "cambia la passphrase"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"Il generatore di numeri casuali � solo un ripiego per fare\n"
-"funzionare il programma - non � assolutamente un RNG forte!\n"
-"\n"
-"NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
-"\n"
+"@\n"
+"Opzioni:\n"
+" "
 
-#: cipher/rndegd.c:202
-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"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
 msgstr ""
-"Attendi, sto raccogliendo entropia. Se pu� evitare di annoiarti lavora un "
-"po',\n"
-"visto che questo migliorer� la qualit� dell'entropia.\n"
 
-#: cipher/rndlinux.c:132
-#, 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"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
 msgstr ""
-"\n"
-"Non ci sono abbastanza byte casuali disponibili. Per favore fai qualche\n"
-"altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
-"(Servono altri %d byte)\n"
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "prolisso"
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "rebuild della cache del portachiavi fallito: %s\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "meno prolisso"
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|carica il modulo di estensione FILE"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "cerca delle chiavi su un key server"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "aggiorna il database della fiducia"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Per favore segnala i bug a <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "invio al keyserver fallito: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "file con le opzioni `%s': %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "lettura delle opzioni da `%s'\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "errore creando `%s': %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "impossibile creare la directory `%s': %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "impossibile creare %s: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "aggiornamento fallito: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "scrittura della chiave segreta in `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: directory creata\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "trustdb: read fallita (n=%d): %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: impossibile creare la directory: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "aggiornamento della chiave segreta fallito: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: saltata: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "errore leggendo il keyblock: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent non � disponibile in questa sessione\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
+
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: errore durante la lettura del record libero: %s\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' � gi� compresso\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "genera una nuova coppia di chiavi"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "passphrase errata"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "Cancella"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "chiave `%s' non trovata: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "parti della chiave segreta non sono disponibili\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "errore di lettura: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
+msgid "Yes"
+msgstr "si|s�"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Generazione della chiave fallita: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "impossibile aprire il file: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "Firma %s, algoritmo di digest %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "errore leggendo `%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "errore creando `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[User ID non trovato]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent non � disponibile in questa sessione\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "impossibile connettersi a `%s': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "problema di comunicazione con gpg-agent\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "problema con l'agent: ha restituito 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "interrotto dall'utente\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "problema con l'agent: ha restituito 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "impossibile disabilitare i core dump: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "si|s�"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "sS"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "quit"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "Non sono stati trovati dati OpenPGP validi.\n"
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: g10/armor.c:320
 #, c-format
@@ -386,177 +808,214 @@ msgstr ""
 "carattere quoted printable nell'armatura - probabilmente � stato usato\n"
 "un MTA buggato\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+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 caratteri stampabili o\n"
+"spazi e terminare con un '='\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
+
+#: g10/build-packet.c:980
+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/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "non leggibile"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "abilita"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "abilita"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "Nessuna ragione specificata"
 
 # ??? (Md)
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "non esaminato"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -564,207 +1023,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "la chiave segreta non � disponibile"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr ""
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr ""
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Ripeti la passphrase: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "passphrase non ripetuta correttamente; prova ancora"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output non funziona con questo comando\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -807,50 +1214,50 @@ msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 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:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "uso il cifrario %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -858,7 +1265,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -867,174 +1274,209 @@ msgstr ""
 "forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, 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:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "problema nella gestione del pacchetto cifrato\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "l'esecuzione remota dei programmi non � gestita\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "impossibile creare la directory `%s': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "questa piattaforma richiede file temporanei quando si chiamano programmi "
 "esterni\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "impossibile eseguire %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "impossibile eseguire %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "uscita anormale del programma esterno\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "impossibile eseguire il programma esterno\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "impossibile leggere la risposta del programma esterno: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "non sono state trovate chiavi di revoca per `%s'\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chiave segreta inutilizzabile"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, 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:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, 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:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "troppe voci nella pk cache - disabilitata\n"
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[User ID non trovato]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, 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:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
+
+#: g10/getkey.c:2659
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1042,128 +1484,129 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1173,51 +1616,47 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "prolisso"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1225,7 +1664,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1245,15 +1684,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1263,7 +1702,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1271,643 +1710,583 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "file con le opzioni `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "lettura delle opzioni da `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, 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/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent non � disponibile in questa sessione\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 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/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 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/gpg.c:2988
+#: g10/gpg.c:3012
 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, fuzzy, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, fuzzy, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 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/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, 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/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "troppe voci nella pk cache - disabilitata\n"
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[User ID non trovato]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, 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:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
-
-#: g10/getkey.c:2658
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "meno prolisso"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "prende le chiavi da questo portachiavi"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1915,7 +2294,7 @@ msgstr ""
 "Sintassi: gpg [opzioni] [file]\n"
 "Controlla le firme con le chiavi affidabili note\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1925,7 +2304,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:55
+#: g10/helptext.c:57
 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"
@@ -1938,16 +2317,16 @@ msgstr ""
 "segreta.\n"
 "Rispondi \"s�\" per impostare questa chiave come definitivamente affidabile\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1961,7 +2340,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1972,16 +2351,16 @@ msgstr ""
 "campi.\n"
 "Per favore consulta prima il tuo esperto di sicurezza."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Inserisci le dimensioni della chiave"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Rispondi \"si\" o \"no\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1993,19 +2372,19 @@ msgstr ""
 "messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
 "dato come un intervallo."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Inserisci il nome del proprietario della chiave"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Inserisci un commento opzionale"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2019,11 +2398,11 @@ msgstr ""
 "O  per continuare con la generazione della chiave.\n"
 "Q  per abbandonare il processo di generazione della chiave."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2102,12 +2481,12 @@ msgstr ""
 "\n"
 "Se non sai cosa rispondere, rispondi \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Rispondi \"si\" se vuoi firmare TUTTI gli user ID"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2115,11 +2494,11 @@ msgstr ""
 "Rispondi \"si\" se vuoi davvero cancellare questo user ID.\n"
 "Tutti i certificati saranno persi!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Rispondi \"si\" se va bene cancellare la subchiave"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2130,7 +2509,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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2144,13 +2523,13 @@ msgstr ""
 "usata perch� questa chiave potrebbe stabilire una connessione di fiducia\n"
 "attraverso una chiave gi� certificata."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 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:215
+#: g10/helptext.c:217
 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"
@@ -2165,7 +2544,7 @@ msgstr ""
 "non\n"
 "� valida per qualche ragione e ne � disponibile un'altra."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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"
@@ -2176,23 +2555,23 @@ msgstr ""
 "la lista di preferenze corrente. L'orario di tutte le autofirme coinvolte\n"
 "sar� aumentato di un secondo.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 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:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2200,7 +2579,7 @@ msgstr ""
 "Inserisci il nuovo nome del file. Se premi INVIO sar� usato il nome\n"
 "predefinito (quello indicato tra parentesi)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2229,7 +2608,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:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2239,11 +2618,11 @@ msgstr ""
 "questo certificato di revoca. Per favore sii conciso.\n"
 "Una riga vuota termina il testo.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Non � disponibile un aiuto"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
@@ -2279,498 +2658,493 @@ msgstr "chiave segreta inutilizzabile"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             importate: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Non puoi cancellare l'ultimo user ID!\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, 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:764
+#: g10/import.c:763
 #, 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:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, fuzzy, c-format
 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, 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:1276
+#: g10/import.c:1275
 #, 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:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, 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:1389
+#: g10/import.c:1388
 #, 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:1391
+#: g10/import.c:1390
 #, 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:1409
+#: g10/import.c:1408
 #, 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:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 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:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, 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:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, 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:1788
+#: g10/import.c:1787
 #, fuzzy, c-format
 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"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, fuzzy, c-format
 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\n"
 "revoca %08lX non � presente.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "portachiavi `%s' creato\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2783,63 +3157,63 @@ msgstr ""
 "impronte digitali da diverse fonti...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fido marginalmente\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi fido completamente\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'user ID \"%s\" � scaduto."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2848,11 +3222,11 @@ msgstr ""
 "L'autofirma su \"%s\"\n"
 "� una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2861,11 +3235,11 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� scaduta\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2874,43 +3248,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 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:780
+#: g10/keyedit.c:781
 #, 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:783
+#: g10/keyedit.c:784
 #, 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:788
+#: g10/keyedit.c:789
 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:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2918,11 +3292,11 @@ msgstr ""
 "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2932,32 +3306,32 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, 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:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2966,100 +3340,100 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3067,11 +3441,11 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3079,206 +3453,206 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3286,241 +3660,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe della firma sconosciuta"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3529,19 +3903,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3550,7 +3924,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3559,56 +3933,56 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3618,381 +3992,386 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 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"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 #, 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:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 #, fuzzy
 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
 "incrociata\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 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:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferenza %c%lu � doppia\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifra dati"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4008,7 +4387,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4024,40 +4403,40 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4065,12 +4444,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4087,44 +4466,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4135,7 +4514,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
 
@@ -4150,23 +4529,23 @@ msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4174,12 +4553,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4191,7 +4570,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4203,50 +4582,50 @@ 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:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4256,12 +4635,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4269,7 +4648,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4277,31 +4656,31 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "mai       "
 
@@ -4329,162 +4708,162 @@ msgstr "Annotazione della firma: "
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "    Impronta digitale della subchiave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "controllo il portachiavi `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4492,470 +4871,443 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "impossibile disabilitare i core dump: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo di cifratura non implementato"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrami ulteriori informazioni\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Non compresso"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Il file `%s' esiste. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffisso sconosciuto\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Inserire il nuovo nome del file"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "creato un nuovo file di configurazione `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: directory creata\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 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:1157
+#: g10/parse-packet.c:1211
 #, 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:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent non � disponibile in questa sessione\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
-
-#: g10/passphrase.c:345
-#, 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/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "impossibile connettersi a `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con l'agent - uso dell'agent disattivato\n"
@@ -5021,7 +5373,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5038,39 +5390,35 @@ msgstr ""
 "molto\n"
 "grande! Dimensioni vicine a 240x288 sono una buona scelta.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Inserisci il nome del file JPEG per l'ID fotografico: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\": non � un file JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Questa foto � giusta? (s/N/q) "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "impossibile mostrare l'ID fotografico\n"
 
@@ -5355,62 +5703,57 @@ 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:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "errore creando `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non � gestita\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, 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:302
+#: g10/pubkey-enc.c:305
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
@@ -5534,95 +5877,95 @@ msgstr "(Non � stata data una descrizione)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Va bene cos�? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, 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:72
+#: g10/seckey-cert.c:74
 #, 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:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase non valida; riprova"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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:366
+#: g10/seckey-cert.c:406
 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/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "creata una chiave debole - riprovo\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, 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:113
+#: g10/sig-check.c:119
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX ha una certificature incrociata\n"
 "non valida\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 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:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 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:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5630,7 +5973,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5638,60 +5981,60 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, 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:287
+#: g10/sig-check.c:298
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida della chiave %08lX a causa di un\n"
 "bit critico sconosciuto\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, 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:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ATTENZIONE: impossibile espandere i %% nell'URL (troppo lunga). Usata "
 "inespansa.\n"
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5700,7 +6043,7 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5720,54 +6063,54 @@ msgstr "controllo della firma creata fallito: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
 "2.x\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la chiave non � indicata come insicura - impossibile usarla con il RNG "
 "finto!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "saltata `%s': doppia\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5827,51 +6170,51 @@ msgstr "errore di lettura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "transazione del trustdb troppo grande\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: � stato creato un trustdb non valido\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
@@ -5880,78 +6223,78 @@ msgstr "%s: creato il trustdb\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: il trustdb non � scrivibile\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, 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:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, 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:735
+#: g10/tdbio.c:726
 #, 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:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un file di trustdb\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
@@ -5960,7 +6303,7 @@ msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linea di input pi� lunga di %d caratteri\n"
@@ -6129,7 +6472,7 @@ msgstr ""
 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:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6139,346 +6482,1606 @@ 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:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "errore generale"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "hai trovato un bug... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "pacchetto di tipo sconosciuto"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "versione sconosciuta"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "impossibile aprire il file: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "algoritmo della chiave pubblica sconosciuto"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "creazione dell'armatura fallita: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "algoritmo del digest sconosciuto"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "chiave pubblica errata"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "chiave segreta errata"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "firma errata"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "codice di controllo errato"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "passphrase errata"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "chiave pubblica non trovata"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "algoritmo di cifratura sconosciuto"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "impossibile aprire il portachiavi"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "pacchetto non valido"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "armatura non valida"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "l'user id non esiste"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "la chiave segreta non � disponibile"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "� stata usata la chiave segreta sbagliata"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "non gestito"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "chiave sbagliata"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "invio al keyserver fallito: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "errore durante la lettura del file"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "errore durante la scrittura del file"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "algoritmo di compressione sconosciuto"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "errore durante l'apertura del file"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "errore durante la creazione del file"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "passphrase non valida"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algoritmo della chiave pubblica non implementato"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "algoritmo di cifratura non implementato"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "classe della firma sconosciuta"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "errore leggendo il keyblock: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "errore nel database della fiducia"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "MPI danneggiato"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' � gi� compresso\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "limite della risorsa"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "portachiavi non valido"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "genera una nuova coppia di chiavi"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "certificato danneggiato"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "user id malformato"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "errore durante la chiusura del file"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "errore durante la rinominazione del file"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "errore durante la cancellazione del file"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "dati inattesi"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "date in conflitto"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "algoritmo della chiave pubblica non utilizzabile"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Generazione della chiave fallita: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "il file esiste"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "chiave debole"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "argomento non valido"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "URI non valida"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "URI non gestito"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "errore di rete"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "non cifrato"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-# ??? (Md)
-#: util/errors.c:104
-msgid "not processed"
-msgstr "non esaminato"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "lettura delle opzioni da `%s'\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "chiave pubblica inutilizzabile"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "chiave segreta inutilizzabile"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "errore del keyserver"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "Cancella"
+msgid "do not use the internal CCID driver"
+msgstr "non usa per niente il terminale"
 
-#: util/errors.c:110
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
+
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "non cifrato"
+msgid "allow the use of admin card commands"
+msgstr "comandi in conflitto\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "non ci sono dati firmati\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... questo � un bug (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "hai trovato un bug... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "si|s�"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "sS"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "impossibile aprire `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "scrittura della chiave segreta in `%s'\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "inizializzazione del trustdb fallita: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "NOTA: la chiave � stata revocata"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "certificato danneggiato"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Chiave disponibile presso: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "controllo della firma creata fallito: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "genera un certificato di revoca"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Questa chiave � scaduta!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "mostra le impronte digitali"
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "controllo della firma creata fallito: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "verifica una firma"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+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"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "sconosciuto"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "errore: impronta digitale non valida\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "errore: impronta digitale non valida\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Ti serve una passphrase per sbloccare la chiave segreta dell'utente:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "algoritmo di hash non valido `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "L'indirizzo di email non � valido\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "errore creando il portachiavi `%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Generazione della chiave fallita: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "chiave `%s' non trovata: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "errore leggendo il keyblock: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "Certificato di revoca creato.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "la preferenza %c%lu � doppia\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(Non � stata data una descrizione)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "scrittura in `%s'\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[file]|fai una firma"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "elenca le chiavi segrete"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "certificato danneggiato"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "rimuove le chiavi dal portachiavi pubblico"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "certificato danneggiato"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "certificato danneggiato"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "cambia la passphrase"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "crea un output ascii con armatura"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NOME|usa NOME come destinatario predefinito"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "usa la chiave predefinita come destinatario predefinito"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "non usa per niente il terminale"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "forza l'uso di firme v3"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "usa sempre un MDC per cifrare"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "modo batch: non fa domande"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "risponde \"s�\" a quasi tutte le domande"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "risponde \"no\" a quasi tutte le domande"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "aggiungi questo portachiavi alla lista"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "aggiungi questo portachiavi segreto alla lista"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOME|usa NOME come chiave segreta predefinita"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|cerca le chiavi in questo keyserver"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NOME|imposta NOME come set di caratteri del terminale"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|FILE|carica il modulo di estensione FILE"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOME|usa l'algoritmo di cifratura NOME"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOME|usa l'algoritmo di message digest NOME"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|usa l'algoritmo di compressione N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sintassi: gpg [opzioni] [files]\n"
+"firma, controlla, cifra o decifra\n"
+"l'operazione predefinita dipende dai dati di input\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "uso: gpg [opzioni] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "impossibile connettersi a `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "scrittura in `%s'\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "impossibile chiudere `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Numero totale esaminato: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "genera un certificato di revoca"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "errore creando il portachiavi `%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "portachiavi `%s' creato\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "inizializzazione del trustdb fallita: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "inizializzazione del trustdb fallita: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? problema controllando la revoca: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "errore: impronta digitale non valida\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "controllo della firma creata fallito: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Firma scaduta il %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Firma valida da \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                alias \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "quit"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "qQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "riga troppo lunga\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "destinatario predefinito `%s' sconosciuto\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "firma fallita: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "uso: gpg [opzioni] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "chiave pubblica non trovata"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "errore creando il portachiavi `%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Comandi:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "decifratura corretta\n"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "ATTENZIONE: si sta usando memoria insicura!\n"
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "decifratura corretta\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [nomefile]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: util/secmem.c:98
-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"
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "Non � permesso usare %s con %s!\n"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "impossibile aprire il file: %s\n"
 
-#~ 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"
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "impossibile creare la directory `%s': %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "impossibile aprire `%s': %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "errore scrivendo il portachiavi `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "l'esecuzione remota dei programmi non � gestita\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "impossibile creare %s: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "impossibile creare %s: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "aggiornamento fallito: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "aggiornamento fallito: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "aggiornamento fallito: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "aggiornamento fallito: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "impossibile creare `%s': %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "impossibile creare `%s': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "l'algoritmo di protezione %d%s non � gestito\n"
+
+#, fuzzy
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "impossibile generare un numero primo di meno di %d bit\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "impossibile generare un numero primo di meno di %d bit\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "impossibile aprire `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "scrittura della chiave segreta in `%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "impossibile eseguire stat su `%s': %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' non � un file regolare - ignorato\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "nota: il file random_seed � vuoto\n"
+
+#~ 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"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "impossibile leggere `%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "nota: il file random_seed non � stato aggiornato\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "impossibile scrivere su `%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "impossibile chiudere `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr ""
+#~ "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "per ulteriori informazioni si veda http://www.gnupg.org/it/why-not-idea."
-#~ "html\n"
+#~ "Il generatore di numeri casuali � solo un ripiego per fare\n"
+#~ "funzionare il programma - non � assolutamente un RNG forte!\n"
+#~ "\n"
+#~ "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
+#~ "\n"
+
+#~ 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"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "\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 ""
-#~ "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
-#~ "spazi e terminare con un '='\n"
+#~ "\n"
+#~ "Non ci sono abbastanza byte casuali disponibili. Per favore fai qualche\n"
+#~ "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
+#~ "(Servono altri %d byte)\n"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "la chiave segreta non � disponibile"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "gpg-agent non � disponibile in questa sessione\n"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Non puoi cancellare l'ultimo user ID!\n"
+
+#~ msgid "general error"
+#~ msgstr "errore generale"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "il valore di una nota non deve usare caratteri di controllo\n"
+#~ msgid "unknown packet type"
+#~ msgstr "pacchetto di tipo sconosciuto"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
+#~ msgid "unknown version"
+#~ msgstr "versione sconosciuta"
 
-#~ msgid "not human readable"
-#~ msgstr "non leggibile"
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "algoritmo della chiave pubblica sconosciuto"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "algoritmo del digest sconosciuto"
+
+#~ msgid "bad public key"
+#~ msgstr "chiave pubblica errata"
+
+#~ msgid "bad secret key"
+#~ msgstr "chiave segreta errata"
+
+#~ msgid "bad signature"
+#~ msgstr "firma errata"
+
+#~ msgid "checksum error"
+#~ msgstr "codice di controllo errato"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "algoritmo di cifratura sconosciuto"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "impossibile aprire il portachiavi"
+
+#~ msgid "invalid packet"
+#~ msgstr "pacchetto non valido"
+
+#~ msgid "invalid armor"
+#~ msgstr "armatura non valida"
+
+#~ msgid "no such user id"
+#~ msgstr "l'user id non esiste"
+
+#~ msgid "secret key not available"
+#~ msgstr "la chiave segreta non � disponibile"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "� stata usata la chiave segreta sbagliata"
+
+#~ msgid "not supported"
+#~ msgstr "non gestito"
+
+#~ msgid "bad key"
+#~ msgstr "chiave sbagliata"
+
+#~ msgid "file read error"
+#~ msgstr "errore durante la lettura del file"
+
+#~ msgid "file write error"
+#~ msgstr "errore durante la scrittura del file"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "algoritmo di compressione sconosciuto"
+
+#~ msgid "file open error"
+#~ msgstr "errore durante l'apertura del file"
+
+#~ msgid "file create error"
+#~ msgstr "errore durante la creazione del file"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "passphrase non valida"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algoritmo della chiave pubblica non implementato"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "algoritmo di cifratura non implementato"
+
+#~ msgid "unknown signature class"
+#~ msgstr "classe della firma sconosciuta"
+
+#~ msgid "trust database error"
+#~ msgstr "errore nel database della fiducia"
+
+#~ msgid "resource limit"
+#~ msgstr "limite della risorsa"
+
+#~ msgid "invalid keyring"
+#~ msgstr "portachiavi non valido"
+
+#~ msgid "malformed user id"
+#~ msgstr "user id malformato"
+
+#~ msgid "file close error"
+#~ msgstr "errore durante la chiusura del file"
+
+#~ msgid "file rename error"
+#~ msgstr "errore durante la rinominazione del file"
+
+#~ msgid "file delete error"
+#~ msgstr "errore durante la cancellazione del file"
+
+#~ msgid "unexpected data"
+#~ msgstr "dati inattesi"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "date in conflitto"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "algoritmo della chiave pubblica non utilizzabile"
+
+#~ msgid "file exists"
+#~ msgstr "il file esiste"
+
+#~ msgid "weak key"
+#~ msgstr "chiave debole"
+
+#~ msgid "invalid argument"
+#~ msgstr "argomento non valido"
+
+#~ msgid "bad URI"
+#~ msgstr "URI non valida"
+
+#~ msgid "unsupported URI"
+#~ msgstr "URI non gestito"
+
+#~ msgid "network error"
+#~ msgstr "errore di rete"
+
+#~ msgid "not encrypted"
+#~ msgstr "non cifrato"
+
+# ??? (Md)
+#~ msgid "not processed"
+#~ msgstr "non esaminato"
+
+#~ msgid "unusable public key"
+#~ msgstr "chiave pubblica inutilizzabile"
+
+#~ msgid "unusable secret key"
+#~ msgstr "chiave segreta inutilizzabile"
+
+#~ msgid "keyserver error"
+#~ msgstr "errore del keyserver"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "non cifrato"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "non ci sono dati firmati\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... questo � un bug (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "ATTENZIONE: si sta usando memoria insicura!\n"
+
+#~ 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"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
+
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6516,10 +8119,6 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "errore nella creazione della passhprase: %s\n"
-
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "passphrase errata o algoritmo di cifratura sconosciuto (%d)\n"
 
@@ -6532,18 +8131,9 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "impossibile ottenere il FD di scrittura dell'agent\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "problema di comunicazione con gpg-agent\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "passphrase troppo lunga\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "risposta non valida dall'agent\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "problema con l'agent: ha restituito 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "scegli la chiave secondaria N"
 
@@ -6789,20 +8379,9 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ msgstr ""
 #~ "questo algoritmo di cifratura � deprecato; usane uno pi� standard!\n"
 
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "scrittura in `%s'\n"
-
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "mi dispiace, non � possibile fare questo in modo batch\n"
 
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "chiave `%s' non trovata: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "impossibile creare `%s': %s\n"
-
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "impossibile aprire il file: %s\n"
@@ -6848,9 +8427,6 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "impossibile aprire `%s': %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
 #~ msgstr " %d = Mi fido marginalmente\n"
@@ -6888,18 +8464,12 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: impossibile creare: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: impossibile creare la directory: %s\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr "Se vuoi usare comunque questa chiave revocata, rispondi \"si\"."
 
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "Impossibile aprire la foto \"%s\": %s\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "impossibile aprire il file: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "errore: mancano due punti\n"
 
@@ -6915,9 +8485,6 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- trovata una revoca falsificata\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? problema controllando la revoca: %s\n"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr "[scadenza: %s]"
@@ -6929,9 +8496,6 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "[revocata]"
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "impossibile creare %s: %s\n"
-
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
@@ -6971,18 +8535,6 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ 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"
 
@@ -6992,48 +8544,18 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ 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 "|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 "|[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"
 
@@ -7055,15 +8577,6 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ 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"
 
@@ -7114,9 +8627,6 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\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 "success sending to `%s' (status=%u)\n"
 #~ msgstr "inviata con successo a `%s' (status=%u)\n"
 
diff --git a/po/ja.po b/po/ja.po
index f795c7736..fe8fae155 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -17,293 +17,721 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "pbits=%u qbits=%u���ǿ��������Ǥ��ޤ���\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
-msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "��%s�פ����å��Ǥ��ޤ���\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "̾����̵����ʸ��������ޤ�\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "������MPI�Ǥ�"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "�ѥ��ե졼���������Ǥ�"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "�ѥ��ե졼���������Ǥ�"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
+
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "��%s�פ�Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "���֤μ������顼: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "��%s�פ����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "����: random_seed �ե�����϶��Ǥ�\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "���Ը�����μ������顼: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "�ٹ�: ̵����Ĺ���� random_seed �ե����� - �Ȥ��ޤ���\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "��%s�פ��ɤ�ޤ���: %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "��%s�פ˽񤭹���ޤ���: %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "��%s�פ��Ĥ����ޤ���: %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "�ٹ�: ���ݤ���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "|A|Admin PIN"
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "PIN�������: "
+
+#: agent/divert-scd.c:278
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
+
+#: agent/divert-scd.c:290
+#, fuzzy, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "PIN [��̾��: %lu]"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
-"��ܤ���Ƥ�����������Ҥϡ��Ź��ѤȤ��ƤϤ����ޤĤǡ�\n"
-"����������Ǥ��ޤ���!\n"
-"\n"
-"���Υץ����������������ǡ�������ڻȤäƤϤ����ޤ���!!\n"
+"��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "�ѥ��ե졼�����ѹ�"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "�ѥ��ե졼�����ѹ�"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"���ץ����:\n"
+" "
+
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
 msgstr ""
-"�𻨤���������Ƥ��ޤ��Τǡ����Ԥ������������𻨤��μ�������\n"
-"���ޤ��Τǡ��⤷˰�����鲿����Ȥ��Ƥ���������\n"
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "��Ĺ"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "����Ť�"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "�������С��θ��򸡺�����"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "���ѥǡ����١����򹹿�"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "�ѥ��ե졼���κ������顼: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
-"\n"
-"��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
-"�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/app-openpgp.c:596
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:609
+#: agent/gpg-agent.c:303
 #, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
+
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "���ץ���󡦥ե������%s��: %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "��%s�פκ������顼: %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
+msgstr ""
 
-#: g10/app-openpgp.c:977
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
 #, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
+msgid "can't create socket: %s\n"
+msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
-msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
-msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
-msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
 #, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
+msgid "directory `%s' created\n"
+msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
+msgid "handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1432
 #, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
-msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
-msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
-msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, fuzzy, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: �����å�: %s\n"
+
+#: agent/gpg-agent.c:1650
+#, fuzzy
+msgid "no gpg-agent running in this session\n"
+msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
-msgstr "|A|Admin PIN"
+#: agent/preset-passphrase.c:100
+#, fuzzy
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "|AN|New Admin PIN"
-msgstr "|A|������Admin PIN"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/app-openpgp.c:1492
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
+msgstr ""
+
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "|N|New PIN"
-msgstr "������PIN"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: g10/app-openpgp.c:1496
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "������PIN�μ������顼: %s\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
-msgid "error reading application data\n"
-msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+msgstr ""
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
-msgid "error reading fingerprint DO\n"
-msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: g10/app-openpgp.c:1562
-msgid "key already exists\n"
-msgstr "���Ϥ⤦����ޤ�\n"
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
-msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/app-openpgp.c:1568
-msgid "generating new key\n"
-msgstr "��������������\n"
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "����󥻥�"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "��%s�פǥ��顼: %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "���ץ���󡦥ե������%s��: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
+#, c-format
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "��̩��ʬ�������ޤ���\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:228
 #, fuzzy, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
+msgid "error reading `%s', line %d: %s\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
 #, c-format
-msgid "failed to store the key: %s\n"
-msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
-msgstr "�������δ֡����Ԥ��������� ...\n"
+#: agent/trustlist.c:453
+#, fuzzy
+msgid "Yes"
+msgstr "yes"
 
-#: g10/app-openpgp.c:1901
-msgid "generating key failed\n"
-msgstr "���������˼��Ԥ��ޤ���\n"
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
-#, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "������������λ���ޤ��� (%d��)\n"
+#: common/exechelp.c:279 common/exechelp.c:370
+#, fuzzy, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:382 common/exechelp.c:540
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
+msgid "error forking process: %s\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "����ޤǤ˺������줿��̾: %lu\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "PIN [��̾��: %lu]"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
+
+#: common/exechelp.c:487
+#, c-format
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "��%s�פκ������顼: %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[�桼����ID�����Ĥ���ޤ���]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
+msgid "can't connect to `%s': %s\n"
+msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "gpg-agent�Ȥ��̿��㳲\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "�桼�����ˤ���ä�\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "����������פ���ѶػߤˤǤ��ޤ���: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "yes"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "quit"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr "okay|okay"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:115
+msgid "cC"
+msgstr "cC"
 
 #: g10/armor.c:320
 #, c-format
@@ -380,163 +808,199 @@ msgstr ""
 "���������quoted printableʸ��������ޤ��������餯�Х��Τ���\n"
 "MTA��Ȥä��ΤǤ��礦\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"����̾�ˤϰ�����ǽ��ʸ��������Τߤ�Ȥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "����̾���ͤ�����ʸ����ȤäƤϤ����ޤ���\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "�ͤˤ��ɤ�ޤ���"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "�����? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[̤����]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr "��"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr "��"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "̵����"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr "̤����"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr "����"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr "��������õ������URL: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr "�������󡦥ǡ��� (���������̾): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 msgid "Language preferences: "
 msgstr "���������: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 msgid "Error: invalid length of preference string.\n"
 msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "���� ((M)�ˡ�(F)��������): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 msgid "Error: invalid response.\n"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 msgid "CA fingerprint: "
 msgstr "CA���: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "�������Ǥ��ޤ���: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr "OpenPGP�����ɤǤ���ޤ���"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -547,193 +1011,139 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "���Υ��ޥ�ɤ�Ȥä��ѹ����٤��Ǥ� --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "�������븰�η������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) ��̾��\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �Ź沽��\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "������̩��ʬ��̵���Ǥ�\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "����õ������URL���ѹ�"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "��������̾���ѹ�"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "�����������ѹ�"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "CA������ѹ�"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "��̾����PIN�ե饰��ȿž"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "����������������"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "�������ѥ��ޥ��\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "��̩���������ޤ���"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr "�����ɤ�������return���ǤĤ���'c'�Ǽ�ä�: "
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-"���Υ����ɤ�ȴ�����������֤Τ��������Ƥ�������:\n"
-"   %.*s\n"
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr "�Ѱդ���return���ǤĤ���'c'�Ǽ�ä�: "
-
-#: g10/cardglue.c:917
-#, fuzzy
-msgid "Enter New Admin PIN: "
-msgstr "Admin PIN������: "
-
-#: g10/cardglue.c:918
-#, fuzzy
-msgid "Enter New PIN: "
-msgstr "PIN������: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr "Admin PIN������: "
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr "PIN������: "
-
-#: g10/cardglue.c:937
-msgid "Repeat this PIN: "
-msgstr "PIN�������: "
-
-#: g10/cardglue.c:952
-msgid "PIN not correctly repeated; try again"
-msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -773,216 +1183,249 @@ msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K�⡼�ɤΤ��ᡢ�о�ESK�ѥ��åȤ�Ȥ��ޤ���\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: ��%s�פ϶��Υե�����Ǥ�\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "��%s�פ����ɤ߽Ф��ޤ�\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "�ٹ�: ���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s�Ź沽 ������:��%s��\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ���\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "�Ź沽�ѥ��åȤμ谷���Ǿ㳲\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "���ץ���󡦥ե�����ε��ĥ⡼�ɤ��������ǤϤʤ��Τǡ�\n"
 "�����ץ������θƽФ��ϡ����ѶػߤǤ���\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "���Υץ�åȥۡ�����ȡ������ץ������θƽФ��ˤϡ�����ե����뤬ɬ�פǤ�\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "��%s�פ�¹ԤǤ��ޤ���: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�������%s�פ�¹ԤǤ��ޤ���: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "�����ץ������θƽФ��ǥ����ƥࡦ���顼: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "�����ץ�����ब���Լ����˽�λ\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "�����ץ�������¹ԤǤ��ޤ���\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "�����ץ������α������ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) ��%s��: %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "��%s���Ѥμ����������Ĥ���ޤ���\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "�������"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "���ѤǤ��ʤ���̩���Ǥ�"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 msgid "exporting secret keys not allowed\n"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "��%s: �ݸ��Ƥ��ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "��%s: PGP 2.x�����θ��Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
+
+#: g10/getkey.c:176
+msgid "[User ID not found]"
+msgstr "[�桼����ID�����Ĥ���ޤ���]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
+
+#: g10/getkey.c:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
+
+#: g10/getkey.c:2659
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -990,127 +1433,128 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "�����"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1120,55 +1564,51 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "��Ĺ"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1617,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1197,15 +1637,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1215,7 +1655,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1223,626 +1663,568 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "���ץ���󡦥ե������%s��: %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2986
+#: g10/gpg.c:3010
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:3012
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
-
-#: g10/getkey.c:175
-msgid "[User ID not found]"
-msgstr "[�桼����ID�����Ĥ���ޤ���]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
-
-#: g10/getkey.c:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
-
-#: g10/getkey.c:2658
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "����Ť�"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭹���"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1850,7 +2232,7 @@ msgstr ""
 "��ʸ: gpg [���ץ����] [�ե�����]\n"
 "���Το��Ѥ������ǽ�̾�򸡺�\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1860,7 +2242,7 @@ msgstr ""
 "���󶡤���ޤ��󡣤���ϡ�web-of-trust �μ�����ɬ�פǡ�\n"
 "(����Ū�ˤǤ���) web-of-certificates �Ȥ�̵�ط��Ǥ���"
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1872,16 +2254,16 @@ msgstr ""
 "�븰�Τ��ȤǤ������θ�������Ū�˿��Ѥ��뤳�Ȥˤ���ʤ顢\n"
 "��yes�ɤ������Ƥ���������\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�ɤ������Ƥ���������"
 
-#: g10/helptext.c:66
+#: g10/helptext.c:68
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "���ʤ��������å���������Υ桼����ID�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1904,7 +2286,7 @@ msgstr ""
 "\n"
 "�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ���"
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1914,16 +2296,16 @@ msgstr ""
 "���Υ��르�ꥺ��ϡ�������ϰ�������ǻȤ���٤��Ǥ���\n"
 "�ޤ����������ƥ���������Ȥˤ����̤���������"
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "����Ĺ�������Ϥ��Ƥ�������"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "��yes�ɤ���no�ɤ������Ƥ�������"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1935,19 +2317,19 @@ msgstr ""
 "ɽ������ʤ��Ǥ��礦���������ꡢ�����ƥ�������ͤ���֤��Ѵ�\n"
 "����褦�˻�ߤޤ���"
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "����ͭ�Ԥ�̾�������Ϥ��Ƥ�������"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "���ץ����Ǥ������Żҥ᡼��Υ��ɥ쥹�����Ϥ��뤳�Ȥ򶯤��侩���ޤ�"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "���ץ����Υ����Ȥ����Ϥ��Ƥ�������"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1961,11 +2343,11 @@ msgstr ""
 "O  ��������³�ԡ�\n"
 "Q  �������ν�λ��"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "�������������Ƥ褱��С���yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
 
-#: g10/helptext.c:148
+#: g10/helptext.c:150
 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"
@@ -2034,11 +2416,11 @@ msgstr ""
 "\n"
 "���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������"
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "���Ƥ� �桼����ID�˽�̾��������С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2046,11 +2428,11 @@ msgstr ""
 "���Υ桼����ID�������˺����������С���yes�ɤ������Ƥ���������\n"
 "�����������Ʊ���˾õ�ޤ�!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "���������������Ƥ褱��С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2060,7 +2442,7 @@ msgstr ""
 "�Ϥʤ��Ǥ��礦���ʤ��ʤ顢���ν�̾�ϡ����ؤο��Ѥ��ؤκ����䡢\n"
 "���θ��ˤ������ˤȤäƽ��פ�����Ǥ���"
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2072,7 +2454,7 @@ msgstr ""
 "�ʤ��ʤ顢���ν�̾�θ��ϡ��⤦�������줿¾�θ��ǿ��Ѥ��ؤ��������\n"
 "���⤷��ʤ�����Ǥ���"
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2080,7 +2462,7 @@ msgstr ""
 "���ν�̾��ͭ���ǤϤ���ޤ��󡣤��Τ��Ȥϡ����ʤ��θ��ؤ��������٤���\n"
 "�Ȥ�����̣�Ǥ���"
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2093,7 +2475,7 @@ msgstr ""
 "����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��ͭ���ǤϤʤ��ơ�\n"
 "���ؤȤʤ븰��������ˤΤߡ������¹Ԥ��Ƥ���������"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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"
@@ -2102,23 +2484,23 @@ msgstr ""
 "���� (�ޤ������򤷤�) �桼����ID�������򡢺��������������ѹ�\n"
 "���ޤ����ط����뼫�ʽ�̾�������ϡ�1�ä����ߤޤ���\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "���Ϥ����ѥ��ե졼���γ�ǧ�Τ��ᡢ�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��񤭤��Ƥ褱��С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2126,7 +2508,7 @@ msgstr ""
 "�������ե�����̾�����Ϥ��Ƥ���������ñ��RETURN���ǤĤȡ�\n"
 "(��̤Ǽ�����) ����Υե�����̾����Ѥ��ޤ���"
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2155,7 +2537,7 @@ msgstr ""
 "      �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
 "      ���˻Ȥ��ޤ���\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2165,11 +2547,11 @@ msgstr ""
 "ʸ�Ϥ����Ϥ��뤳�Ȥ��Ǥ��ޤ���ʸ�Ϥϴʷ�ˤ��Ƥ���������\n"
 "���Ԥǽ����ˤʤ�ޤ���\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "�إ�פϤ���ޤ���"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "��%s�פΥإ�פϤ���ޤ���"
@@ -2205,491 +2587,486 @@ msgstr "���ѤǤ��ʤ���̩���Ǥ�"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��%d�Υ֥��å���ȤФ��ޤ�\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "    ��������: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "�ȤФ�����������: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "          �ɹ���: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "�������桼����ID: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      ����������: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "      ��������̾: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  �����������: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        ̤�ɹ���: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, fuzzy, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "�����Υ桼����ID�Υ��르�ꥺ��:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": �Ź楢�르�ꥺ������� %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": ���󥢥르�ꥺ������� %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": ���̥��르�ꥺ������� %s\n"
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "��%s: �桼����ID������ޤ���\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "��%s: PKS��������¤����\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "��%s:��%s�ɿ�������̾��1��\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "��%s:��%s�ɿ�����������1��\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "��%s:��%s�ɿ�����������%d��\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "��%s:��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "��%s: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "��%s: �����б���������������ޤ���\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "��%s: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "��%s: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "��%s: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "��%s: ̵�������������Ǥ�\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "��%s: �ȤФ����桼����ID��%s��\n"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "��%s: �ȤФ�������\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[����]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "�����ʽ�̾1��\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "�����ʽ�̾%d��\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2700,17 +3077,17 @@ msgstr ""
 "��\n"
 "(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺������ꡢ�ʤɤʤ�)\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = �������ٿ��Ѥ���\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = �����˿��Ѥ���\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2719,46 +3096,46 @@ msgstr ""
 "���ѽ�̾�ο��������Ϥ��Ƥ���������\n"
 "������1����礭���ȡ���̾���褦�Ȥ��Ƥ��븰�ǿ��ѽ�̾����ޤ���\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "��̾�����¤���ɥ᡼�󤫡�����Τʤ�����enter�����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�桼����ID��%s�ɤϡ���λ�Ǥ���"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2767,11 +3144,11 @@ msgstr ""
 "��%s�ɤˤ������뼫�ʽ�̾�ϡ�\n"
 "PGP 2.x�����ν�̾�Ǥ���\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2780,11 +3157,11 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "����λ�Ǥ���\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "��������̾��ȯ�Ԥ��������ڤ��̾�ȸ򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2793,53 +3170,53 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "��������̾�Ǥ���\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "����Ǥ�ƽ�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "��%s�ǽ�̾���٤���ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s����λ���ޤ���\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾����λ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:890
 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:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2848,32 +3225,32 @@ msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
 "���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�ɤ����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �������������Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ������������ޤ�����%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�����? (�ܺ٤� '?' ��): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2882,75 +3259,75 @@ msgstr ""
 "�����ˤ��θ��ˤ��ʤ��θ���%s�ɤǽ�̾���Ƥ褤�Ǥ���\n"
 "(%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr "���θ����������������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr "���θ��ϰ�����������ޤ�����\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2958,11 +3335,11 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2971,206 +3348,206 @@ msgstr ""
 "�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 msgid "Do you really want to do this? (y/N) "
 msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "��̾�μ���"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "������"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "���������ɲ�"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "��������������URI������"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ɥ��ޥ�ɤ�ȤäƤ���������\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3178,159 +3555,159 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr "���μ縰�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 msgid "You must select exactly one key.\n"
 msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "���򤷤����������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���θ��������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "���򤷤����������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
 "����\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 msgid "Set preference list to:\n"
 msgstr "�������������:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3338,71 +3715,71 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3410,17 +3787,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3428,7 +3805,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3437,55 +3814,55 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3494,359 +3871,364 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "��̾����: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "������%s�פν�ʣ\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "¿������Ź�ˡ����\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "¿��������������\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "¿�����밵������\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "����ʸ�����̵���ʹ��ܡ�%s�פ�����ޤ�\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "��%s�˲�ǽ�����: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr "������ǽ�����: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) ��̾�Ϥ�ȿž\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) �Ź��Ϥ�ȿž\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) ǧ���Ϥ�ȿž\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) ��λ\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA��Elgamal (����)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3862,7 +4244,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3878,40 +4260,40 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3919,11 +4301,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3939,44 +4321,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3987,7 +4369,7 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
@@ -4002,23 +4384,23 @@ msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1997
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4026,12 +4408,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4043,7 +4425,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4054,50 +4436,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4106,47 +4488,47 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "̵����    "
 
@@ -4174,616 +4556,589 @@ msgstr "��̾����: "
 msgid "Keyring"
 msgstr "����"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "�������:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr " �������:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 msgid "      Key fingerprint ="
 msgstr "                 ���� ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr "         �����ɤ����� ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s���ѹ��Τʤ����Ǥ�\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s�Ͽ��������Ǥ�\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "��������Ū�ʰ�����η�٤������Ƥ�������\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "���ء�%s�פ򥭥�å��夷�ޤ�\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu�Ĥθ��ޤǥ���å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu�Ĥθ��򥭥�å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�ٹ�: �������С��Υ��ץ�����%s�פϡ����Υץ�åȥۡ���ǤϻȤ��ޤ���\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "����%s�ɤ��������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 msgid "key not found on keyserver\n"
 msgstr "�����������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "��%s��%s���饵���С�%s���׵�\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "��%s��%s���׵�\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��%s��%s������%s������\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��%s��%s������\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 msgid "no keyserver action!\n"
 msgstr "�������С�����������󤬤���ޤ���!\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 msgid "keyserver timed out\n"
 msgstr "�������С��Υ����ॢ����\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 msgid "keyserver internal error\n"
 msgstr "�������С����������顼\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "�������С��̿����顼: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s �Ź沽�Ѥߥ��å����\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "̤�Τ����󥢥르�ꥺ����������줿�ѥ��ե졼�� %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, c-format
 msgid "public key is %s\n"
 msgstr "��������%s�Ǥ�\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ˤ��Ź沽�Ѥߥǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %s, ����%s�˰Ź沽����ޤ���\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ��%s��\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s��, ID %s�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ�������\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź�ˡ��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s��%s�����\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "��%s�ɤ���� ������ ��̾"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "����������פ���ѶػߤˤǤ��ޤ���: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "̵����"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1106
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "�ե������%s�פϴ���¸�ߤ��ޤ���"
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 msgid "Overwrite? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ̤�Τγ�ĥ��\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "�������ե�����̾�����Ϥ��Ƥ�������"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "ɸ����Ϥ˽񤭹��ߤޤ�\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "��̾���줿�ǡ�������%s�פˤ�������ꤷ�ޤ�\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "�����������ե������%s�פ��Ǥ��ޤ���\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
 
-#: g10/openfile.c:424
-#, c-format
-msgid "directory `%s' created\n"
-msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
@@ -4847,7 +5202,7 @@ msgstr "         (�縰ID %s ������)"
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4861,38 +5216,34 @@ msgstr ""
 "���Ƥ����ޤ��礦���⤷�礭�ʼ̿���Ȥ��ȡ����ʤ��θ���Ʊ�ͤ��礭���ʤ�\n"
 "�ޤ�! 240x288���餤�ˤ����ޤ��礭���β����ϡ��Ȥ��褤�Ǥ��礦��\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "�ե���ID�Ѥ�JPEG�ե�����̾�����Ϥ��Ƥ�������: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "JPEG�ե������%s�פ������ޤ���: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "����JPEG�ϡ��������礭�� (%d�Х���) !\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�����˻Ȥ������Ǥ���? (y/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "��%s�פϡ�JPEG�ե�����ǤϤ���ޤ���\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "���μ̿����������Ǥ��� (y/N/q)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "�ե���ID��ɽ����ǽ!\n"
 
@@ -5159,61 +5510,56 @@ msgstr ""
 "�ǡ�������¸����Ƥ��ޤ���\n"
 "��¸����ˤϡ�--output�ɥ��ץ�����ȤäƤ�������\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "��%s�פκ������顼: %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "ʬΥ��̾��\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɽФ��� ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "ƿ̾�μ�����ѤǤ�����̩��%s���ޤ� ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "��λ��ƿ̾�μ�����ѤǤ���\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "�켰��DEK���ϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�Ź楢�르�ꥺ��%d%s��̤�Τ����ѶػߤǤ�\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "�ٹ�: �Ź楢�르�ꥺ��%s�ϼ���ͤ����������äƤ��ޤ���\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "����: ��̩��%s��%s����λ�Ǥ�\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
@@ -5332,144 +5678,144 @@ msgstr "(�����Ϥ���ޤ���)\n"
 msgid "Is this okay? (y/N) "
 msgstr "��������Ǥ���? (y/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ�������"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "����뤵�줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "�ٹ�: ��̾�����󤬡���å�������̷�⤷�ޤ�\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "�ٹ�: ̵������߾���������̾����%s�ˤ���ޤ�\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "������%s�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "������%s�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "��%s��%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "��%s��%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "����: ��̾��%s��%s����λ�Ǥ�\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "̤�ΤΥ���ƥ����롦�ӥåȤˤ�ꡢ��%s�ν�̾�������Ȥߤʤ��ޤ�\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "��%s: ����������̾�ˤ�����������������ޤ���\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "��%s: �����б��ؤν�̾�ˤ�����������������ޤ���\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "����ǡ����ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: ɽ����%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: �ݥꥷ��URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5486,50 +5832,50 @@ msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "���ݤǤ���Ȥ����ե饰�����ˤ����ꤵ��Ƥ��ޤ���\n"
 "��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "��%s�ɤ�ȤФ��ޤ�: ��ʣ\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "��%s�ɤ�ȤФ��ޤ�: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "�����å�: ��̩���Ϥ⤦����ޤ�\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "�����PGP����������Elgamal���ǡ���̾�Ѥˤϰ����ǤϤ���ޤ���!"
 
@@ -5583,51 +5929,51 @@ msgstr "��%s�פ��ɽФ����顼: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��Ԥ��ޤ��� (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "���ѥǡ����١����Υȥ�󥶥�������礭�����ޤ�\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼������ޤ���!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "��%s�פΥ��å�������Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "��%s�פ����å��Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �С�����󡦥쥳���ɤκ����˼��Ԥ��ޤ���: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١��������\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
@@ -5636,78 +5982,78 @@ msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "����: ���ѥǡ����١��������������ǽ�Ǥ�\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١���\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���ѥǡ����١���: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���ѥǡ����١���: �ɽФ��˼��Ԥ��ޤ��� (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �쥳�����ֹ�%lu�֤ΥС�����󡦥쥳����\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ̵���ʥե����롦�С������%d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: �����쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �쥳���ɤν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�ɤ�¹Ԥ��Ƥ���������\n"
@@ -5717,7 +6063,7 @@ msgstr ""
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϡ���갷���ޤ���\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
@@ -5888,7 +6234,7 @@ msgstr ""
 "���ѥǡ����١����ΥС�����󡦥쥳���ɤ������Ǥ��ޤ���: ����ߤ˼��Ԥ��ޤ�"
 "��: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5898,339 +6244,1626 @@ msgstr ""
 "(.sig��.asc)�����ޥ�ɹԤκǽ�Ǥʤ����\n"
 "�ʤ�ʤ����Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "����Ū�ʥ��顼"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "�Х���ȯ�� ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "̤�ΤΥѥ��åȷ��Ǥ�"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "̤�ΤΥС������Ǥ�"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "̤�Τθ��������르�ꥺ��Ǥ�"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "̤�Τ����󥢥르�ꥺ��Ǥ�"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "�������������Ǥ�"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "��̩���������Ǥ�"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "��̾�������Ǥ�"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "�����å����ࡦ���顼"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "�ѥ��ե졼���������Ǥ�"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "�����������Ĥ���ޤ���"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
+
+#: scd/app-openpgp.c:609
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
+
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
+
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "���ؤ������ޤ���"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "̵���ʥѥ��åȤǤ�"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "̵���������Ǥ�"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "���Υ桼����ID�Ϥ���ޤ���"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "��̩���������ޤ���"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "���ä���̩�����Ȥ��Ƥ��ޤ�"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "���ݡ��Ȥ��Ƥ��ޤ���"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "���������Ǥ�"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "�ե�������ɽФ����顼"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "�ե�����ν���ߥ��顼"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr "|A|Admin PIN"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+#, fuzzy
+msgid "|AN|New Admin PIN"
+msgstr "|A|������Admin PIN"
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "�ե�����Υ����ץ󡦥��顼"
+#: scd/app-openpgp.c:1531
+#, fuzzy
+msgid "|N|New PIN"
+msgstr "������PIN"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "�ե�����κ������顼"
+#: scd/app-openpgp.c:1535
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "������PIN�μ������顼: %s\n"
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "�ѥ��ե졼����̵���Ǥ�"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+msgid "error reading application data\n"
+msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "̤�����θ��������르�ꥺ��Ǥ�"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+msgid "error reading fingerprint DO\n"
+msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
+#: scd/app-openpgp.c:1601
+msgid "key already exists\n"
+msgstr "���Ϥ⤦����ޤ�\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "̤�Τν�̾���饹�Ǥ�"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "���ѥǡ����١����Υ��顼�Ǥ�"
+#: scd/app-openpgp.c:1607
+msgid "generating new key\n"
+msgstr "��������������\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "������MPI�Ǥ�"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "�꥽�������³��Ǥ�"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "̵���ʸ��ؤǤ�"
+#: scd/app-openpgp.c:1788
+#, fuzzy, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "�����ʾ�����Ǥ�"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "�桼����ID�ν񼰤�����������ޤ���"
+#: scd/app-openpgp.c:1866
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "�ե�����Υ������������顼"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "�ե�����̾���ѹ����顼"
+#: scd/app-openpgp.c:1939
+msgid "generating key failed\n"
+msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "�ե�����κ�����顼"
+#: scd/app-openpgp.c:1942
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "ͽ�����̥ǡ����Ǥ�"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "������̷�⤷�Ƥ��ޤ�"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "���ѤǤ��ʤ����������르�ꥺ��Ǥ�"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "�ե����뤬¸�ߤ��Ƥ��ޤ�"
+#: scd/app-openpgp.c:2184
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "PIN [��̾��: %lu]"
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "�夤���Ǥ�"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "̵���ʻ���Ǥ�"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "URI�������Ǥ�"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "����URI�ϥ��ݡ��Ȥ��Ƥ��ޤ���"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "�ͥåȥ�������顼"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "�Ź沽����Ƥ��ޤ���"
+#: scd/scdaemon.c:122
+msgid "|NAME|use NAME as ct-API driver"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "̤����"
+#: scd/scdaemon.c:123
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr ""
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "���ѤǤ��ʤ��������Ǥ�"
+#: scd/scdaemon.c:126
+msgid "do not use the internal CCID driver"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "���ѤǤ��ʤ���̩���Ǥ�"
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "�������С��Υ��顼"
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "�������ޥ�ɤ�ɽ��"
 
-#: util/errors.c:109
-msgid "canceled"
-msgstr "����󥻥�"
+#: scd/scdaemon.c:191
+#, fuzzy
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
+
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
+
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
+
+#: scd/scdaemon.c:1008
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr ""
+
+#: scd/scdaemon.c:1013
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr ""
+
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 
-#: util/errors.c:110
-msgid "no card"
-msgstr "�����ɤ�����ޤ���"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#: util/errors.c:111
+#: sm/call-dirmngr.c:216
 #, fuzzy
-msgid "no data"
-msgstr "��̾���줿�ǡ���������ޤ���\n"
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: util/logger.c:158
-msgid "ERROR: "
-msgstr "���顼: "
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
-msgstr "�ٹ�: "
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
 
-#: util/logger.c:224
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "��%s�פ������ޤ���: %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: util/logger.c:230
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "����: ���ϼ����ѤߤǤ�"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "�����ʾ�����Ǥ�"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "�ʲ��˸�������ޤ�: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "���������������"
+
+#: sm/certchain.c:713
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "�Х���ȯ�� ... (%s:%d)\n"
+msgid "certificate with invalid validity: %s"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "yes"
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "yY"
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "���θ�����λ�Ǥ�!"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "CA���: "
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "��̾�򸡾�"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "[̤����]"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "���顼: ̵���ʱ�����\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "���顼: ̵���ʱ�����\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"���Υ桼��������̩���Υ��å���������ˤϥѥ��ե졼��������ޤ�:\n"
+"\"%.*s\"\n"
+"%u�ӥå�%s��, ID %s�������դ�%s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "���Ը�����μ������顼: %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "���ء�%s�פκ������顼: %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "���������˼��Ԥ��ޤ���: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "��̩����%s�ɤ����Ĥ���ޤ���: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "���֥��å����ɽФ����顼: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "����������������\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "������%s�פν�ʣ\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(�����Ϥ���ޤ���)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "�ѥ��ե졼���κ������顼: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[�ե�����]|��̾�����"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[�ե�����]|���ꥢ��̾�����"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "��̩���ΰ���"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "�����ʾ�����Ǥ�"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "�������ؤ��鸰������"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "�����ʾ�����Ǥ�"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "�����ʾ�����Ǥ�"
+
+#: sm/gpgsm.c:263
+#, fuzzy
+msgid "register a smartcard"
+msgstr "���ޡ��ȥ����ɤظ����ɲ�"
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "�ѥ��ե졼�����ѹ�"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "ASCII���������������"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr ""
+
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "use the default key as default recipient"
+msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "force v3 signatures"
+msgstr "��̾�μ���"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr ""
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr ""
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:351
+#, fuzzy
+msgid "add this keyring to the list of keyrings"
+msgstr "���θ����ؤ��������ޤ�"
+
+#: sm/gpgsm.c:352
+#, fuzzy
+msgid "add this secret keyring to the list"
+msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr ""
+
+#: sm/gpgsm.c:355
+#, fuzzy
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|̾��|��̾�����Ѥ˰Ź沽"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr ""
+
+#: sm/gpgsm.c:380
+#, fuzzy
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
+
+#: sm/gpgsm.c:382
+#, fuzzy
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
+
+#: sm/gpgsm.c:384
+#, fuzzy
+msgid "|N|use compress algorithm N"
+msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"��: gpg [���ץ����] [�ե�����]\n"
+"��̾���������Ź沽������\n"
+"��������ϡ����ϥǡ����˰�¸\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "�Ȥ���: gpg [���ץ����] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "    ��������: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "���������������"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "���֤μ������顼: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "���ء�%s�פκ������顼: %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "���֤μ������顼: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "���֤μ������顼: %s\n"
+
+#: sm/keydb.c:1392
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "������PIN�μ������顼: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "���顼: ̵���ʷ����λ��档\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "%s�˻ܤ��줿��̾\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "��%s�ɤ������������̾"
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                ��̾��%s��"
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "quit"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "qQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
-msgstr "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
-msgstr "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
+msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
-msgstr "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
+msgstr ""
 
-#: util/miscutil.c:411
-msgid "cC"
-msgstr "cC"
+#: tools/gpg-connect-agent.c:126
+#, fuzzy
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "�ٹ�: ���ݤʥ��꡼����Ѥ��Ƥ��ޤ�!\n"
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤ����Ǥ��ޤ���\n"
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "̤�ΤΥ��ץ�����%s��\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "�Ȥ���: gpg [���ץ����] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "�����������Ĥ���ޤ���"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "���ء�%s�פκ������顼: %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@���ޥ��:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "���������\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "���������\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [�ե�����̾]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "���ء�%s�פν���ߥ��顼: %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "��%s�פǥ��顼: %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "�����˼��Ԥ��ޤ���: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "�����˼��Ԥ��ޤ���: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "�����˼��Ԥ��ޤ���: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "�����˼��Ԥ��ޤ���: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
+
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "pbits=%u qbits=%u���ǿ��������Ǥ��ޤ���\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "��%s�פ����å��Ǥ��ޤ���\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "��%s�פ�Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "��%s�פ����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "����: random_seed �ե�����϶��Ǥ�\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "�ٹ�: ̵����Ĺ���� random_seed �ե����� - �Ȥ��ޤ���\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "��%s�פ��ɤ�ޤ���: %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "��%s�פ˽񤭹���ޤ���: %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "��%s�פ��Ĥ����ޤ���: %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "�ٹ�: ���ݤ���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
 
 #~ 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"
+#~ "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"
+
+#~ 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"
+
+#~ 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"
+#~ "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
+#~ "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "��̩���������ޤ���"
+
+#~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
+#~ msgstr "�����ɤ�������return���ǤĤ���'c'�Ǽ�ä�: "
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "Please remove the current card and insert the one with serial number:\n"
+#~ "   %.*s\n"
 #~ msgstr ""
-#~ "����̾�ˤϰ�����ǽ��ʸ��������Τߤ�Ȥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
+#~ "���Υ����ɤ�ȴ�����������֤Τ��������Ƥ�������:\n"
+#~ "   %.*s\n"
+
+#~ msgid "Hit return when ready or enter 'c' to cancel: "
+#~ msgstr "�Ѱդ���return���ǤĤ���'c'�Ǽ�ä�: "
+
+#, fuzzy
+#~ msgid "Enter New Admin PIN: "
+#~ msgstr "Admin PIN������: "
+
+#, fuzzy
+#~ msgid "Enter New PIN: "
+#~ msgstr "PIN������: "
+
+#~ msgid "Enter Admin PIN: "
+#~ msgstr "Admin PIN������: "
+
+#~ msgid "Enter PIN: "
+#~ msgstr "PIN������: "
+
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "�����Υ桼����ID�Υ��르�ꥺ��:\n"
+
+#~ msgid "general error"
+#~ msgstr "����Ū�ʥ��顼"
+
+#~ msgid "unknown packet type"
+#~ msgstr "̤�ΤΥѥ��åȷ��Ǥ�"
+
+#~ msgid "unknown version"
+#~ msgstr "̤�ΤΥС������Ǥ�"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "̤�Τθ��������르�ꥺ��Ǥ�"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "̤�Τ����󥢥르�ꥺ��Ǥ�"
+
+#~ msgid "bad public key"
+#~ msgstr "�������������Ǥ�"
+
+#~ msgid "bad secret key"
+#~ msgstr "��̩���������Ǥ�"
+
+#~ msgid "bad signature"
+#~ msgstr "��̾�������Ǥ�"
+
+#~ msgid "checksum error"
+#~ msgstr "�����å����ࡦ���顼"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "���ؤ������ޤ���"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
+#~ msgid "invalid packet"
+#~ msgstr "̵���ʥѥ��åȤǤ�"
+
+#~ msgid "invalid armor"
+#~ msgstr "̵���������Ǥ�"
+
+#~ msgid "no such user id"
+#~ msgstr "���Υ桼����ID�Ϥ���ޤ���"
+
+#~ msgid "secret key not available"
+#~ msgstr "��̩���������ޤ���"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "���ä���̩�����Ȥ��Ƥ��ޤ�"
+
+#~ msgid "not supported"
+#~ msgstr "���ݡ��Ȥ��Ƥ��ޤ���"
+
+#~ msgid "bad key"
+#~ msgstr "���������Ǥ�"
+
+#~ msgid "file read error"
+#~ msgstr "�ե�������ɽФ����顼"
+
+#~ msgid "file write error"
+#~ msgstr "�ե�����ν���ߥ��顼"
+
+#~ msgid "file open error"
+#~ msgstr "�ե�����Υ����ץ󡦥��顼"
+
+#~ msgid "file create error"
+#~ msgstr "�ե�����κ������顼"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "�ѥ��ե졼����̵���Ǥ�"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "̤�����θ��������르�ꥺ��Ǥ�"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
+
+#~ msgid "unknown signature class"
+#~ msgstr "̤�Τν�̾���饹�Ǥ�"
+
+#~ msgid "trust database error"
+#~ msgstr "���ѥǡ����١����Υ��顼�Ǥ�"
+
+#~ msgid "resource limit"
+#~ msgstr "�꥽�������³��Ǥ�"
+
+#~ msgid "invalid keyring"
+#~ msgstr "̵���ʸ��ؤǤ�"
+
+#~ msgid "malformed user id"
+#~ msgstr "�桼����ID�ν񼰤�����������ޤ���"
+
+#~ msgid "file close error"
+#~ msgstr "�ե�����Υ������������顼"
+
+#~ msgid "file rename error"
+#~ msgstr "�ե�����̾���ѹ����顼"
+
+#~ msgid "file delete error"
+#~ msgstr "�ե�����κ�����顼"
+
+#~ msgid "unexpected data"
+#~ msgstr "ͽ�����̥ǡ����Ǥ�"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "������̷�⤷�Ƥ��ޤ�"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "���ѤǤ��ʤ����������르�ꥺ��Ǥ�"
+
+#~ msgid "file exists"
+#~ msgstr "�ե����뤬¸�ߤ��Ƥ��ޤ�"
+
+#~ msgid "weak key"
+#~ msgstr "�夤���Ǥ�"
+
+#~ msgid "invalid argument"
+#~ msgstr "̵���ʻ���Ǥ�"
+
+#~ msgid "bad URI"
+#~ msgstr "URI�������Ǥ�"
+
+#~ msgid "unsupported URI"
+#~ msgstr "����URI�ϥ��ݡ��Ȥ��Ƥ��ޤ���"
+
+#~ msgid "network error"
+#~ msgstr "�ͥåȥ�������顼"
+
+#~ msgid "not encrypted"
+#~ msgstr "�Ź沽����Ƥ��ޤ���"
+
+#~ msgid "not processed"
+#~ msgstr "̤����"
+
+#~ msgid "unusable public key"
+#~ msgstr "���ѤǤ��ʤ��������Ǥ�"
+
+#~ msgid "unusable secret key"
+#~ msgstr "���ѤǤ��ʤ���̩���Ǥ�"
+
+#~ msgid "keyserver error"
+#~ msgstr "�������С��Υ��顼"
+
+#~ msgid "no card"
+#~ msgstr "�����ɤ�����ޤ���"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
+#~ msgid "no data"
+#~ msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "����̾���ͤ�����ʸ����ȤäƤϤ����ޤ���\n"
+#~ msgid "ERROR: "
+#~ msgstr "���顼: "
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
+#~ msgid "WARNING: "
+#~ msgstr "�ٹ�: "
 
-#~ msgid "not human readable"
-#~ msgstr "�ͤˤ��ɤ�ޤ���"
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "�ٹ�: ���ݤʥ��꡼����Ѥ��Ƥ��ޤ�!\n"
+
+#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#~ msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤ����Ǥ��ޤ���\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
+
+#~ 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"
 
 #~ msgid "expired: %s)"
 #~ msgstr "��λ: %s)"
@@ -6259,9 +7892,6 @@ msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "���֤μ������顼: %s\n"
-
 #~ msgid "length of RSA modulus is not %d\n"
 #~ msgstr "RSA��ˡ(modulus)��Ĺ����%d�Ǥ���ޤ���\n"
 
@@ -6280,18 +7910,9 @@ msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "������������ѤΥ����С������FD������Ǥ��ޤ���\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "gpg-agent�Ȥ��̿��㳲\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "����������Ȥ����̵���ʱ���\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "����N������"
 
diff --git a/po/nb.po b/po/nb.po
index 6e3e86a5c..f479a102b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <[email protected]>\n"
 "Language-Team: Norwegian Bokm�l <[email protected]>\n"
@@ -18,292 +18,713 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "kan ikke generere et primtall med pbits=%u qbits=%u\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
-msgstr "kan ikke generere et primtall med mindre enn %d bit\n"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+
+#: agent/call-pinentry.c:359
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr ""
+
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "for lang linje"
+
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "for lang linje"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Ugyldig tegn i navn\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "ugyldig MPI"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "ugyldig passfrase"
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "ingen entropy-innsamlingsmodul ble oppdaget\n"
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "ugyldig passfrase"
 
-#: cipher/random.c:403
+#: agent/command-ssh.c:533
 #, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "kan ikke l�se �%s�: %s\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr ""
 
-#: cipher/random.c:408
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
 #, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "venter p� l�sing av �%s� ...\n"
+msgid "can't create `%s': %s\n"
+msgstr "kan ikke opprette �%s�: %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "kan ikke stat() �%s�: %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "feil ved henting av ny PIN: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "�%s� er ikke en vanlig fil - ignorert\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "merk: random_seed-fila er tom\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "ADVARSEL: ugyldig st�rrelse p� random_seed-fila - ikke brukt\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "kan ikke lese �%s�: %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "merk: random_seed-fila ble ikke oppdatert\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "kan ikke opprette �%s�: %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "kan ikke skrive �%s�: %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "kan ikke lukke �%s�: %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "ADVARSEL: bruke usikker tilfeldig-tall-generator!!\n"
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "|A|Admin PIN"
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Gjenta denne PIN: "
+
+#: agent/divert-scd.c:278
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
+
+#: agent/divert-scd.c:290
+#, fuzzy, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
-"Denne tilfeldig-tall-generatoren er bare en omvei for � f� programmet\n"
-"til � kj�re - den er p� ingen m�te en sterk RNG!\n"
+"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
-"IKKE BRUK NOE DATA GENERERT AV DETTE PROGRAMMET!!\n"
 
-#: cipher/rndegd.c:202
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "endre passfrasen"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "endre passfrasen"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"Vennligst vent, entropy blir innsamlet.  Gj�r noe arbeid dersom det\n"
-"hindrer deg fra � kjede deg, fordi arbeidet vil forbedre kvaliteten p�\n"
-"entropyen.\n"
+"@\n"
+"Valg:\n"
+" "
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
+
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "fyldig output"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "v�re noenlunde stille"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "leser valg fra �%s�\n"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "s�ke etter n�kler p� en n�kkelserver"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "sette en notasjon for de valgte brukeridene"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "ikke oppdat�r tillitsdatabasen etter import"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "feil ved opprettelse av passfrase: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Vennligst rapporter feil til <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
-"\n"
-"Ikke nok tilfeldige byter tilgjengelig.  Vennligst gj�r noe annet\n"
-"arbeid for � gi operativsystemet en sjanse til � samle mer entropy!\n"
-"(Trenger %d flere byter)\n"
 
-#: g10/app-openpgp.c:596
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:609
+#: agent/gpg-agent.c:303
 #, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:977
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
 #, c-format
-msgid "reading public key failed: %s\n"
-msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
-msgstr "respons inneholder ikke data om offentlig n�kkel\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
-msgstr "respons inneholder ikke RSA-modulus\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
-msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "valgfil �%s�: %s\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
 #, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "PIN-callback returnerte en feil: %s\n"
+msgid "reading options from `%s'\n"
+msgstr "leser valg fra �%s�\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
+msgid "error creating `%s': %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
 #, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "bekreftelse av CHV%d mislyktes: %s\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
-msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
-msgstr "feil ved henting av CHV-status fra kort\n"
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "kan ikke opprette �%s�: %s\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
-msgstr "kort er permanent l�st!\n"
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "oppdatering mislyktes: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "skriver hemmelig n�kkel til �%s�\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
+msgid "directory `%s' created\n"
+msgstr "katalogen �%s� ble opprettet\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
-msgstr "|A|Admin PIN"
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
-msgstr "|AN|Ny Admin PIN"
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
-msgstr "|N|Ny PIN"
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1432
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "feil ved henting av ny PIN: %s\n"
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
-msgid "error reading application data\n"
-msgstr "feil ved lesing av applikasjonsdata\n"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
-msgid "error reading fingerprint DO\n"
-msgstr "feil ved lesing av fingeravtrykk DO\n"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
-msgid "key already exists\n"
-msgstr "n�kkel finnes allerede\n"
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, fuzzy, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
-msgstr "eksisterende n�kkel vil bli erstattet\n"
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: hoppet over: %s\n"
 
-#: g10/app-openpgp.c:1568
-msgid "generating new key\n"
-msgstr "generere en ny n�kkel\n"
+#: agent/gpg-agent.c:1650
+msgid "no gpg-agent running in this session\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
-msgstr "tidsstempel for opprettelse mangler\n"
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA-modulus mangler eller har ikke en st�rrelse p� %d bits\n"
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1749
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
+#: agent/preset-passphrase.c:100
+#, fuzzy
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+
+#: agent/protect-tool.c:146
+#, fuzzy
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/protect-tool.c:1206
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr ""
+
+#: agent/protect-tool.c:1209
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr ""
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+msgstr ""
+
+#: agent/protect-tool.c:1217
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr ""
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "ugyldig passfrase"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "feil ved opprettelse av passfrase: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "cancel|cancel"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "feil med �%s�: %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "valgfil �%s�: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "RSA-primtall %s mangler eller har ikke en st�rrelse p� %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "hemmelig n�kkel er ikke tilgjengelig"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "lesefeil ved �%s�: %s\n"
 
-#: g10/app-openpgp.c:1827
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "failed to store the key: %s\n"
-msgstr "klarte ikke � lagre n�kkelen: %s\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
-msgstr "vennligst vent mens n�kkel blir generert ...\n"
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "feil ved lesing av �%s�: %s\n"
 
-#: g10/app-openpgp.c:1901
-msgid "generating key failed\n"
-msgstr "n�kkelgenerering mislyktes\n"
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
+msgstr ""
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:2087
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
 #, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "kortet st�tter ikke digestalgoritme %s\n"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
+
+#: agent/trustlist.c:453
+#, fuzzy
+msgid "Yes"
+msgstr "ja"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:279 common/exechelp.c:370
+#, fuzzy, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "feil ved opprettelse av passfrase: %s\n"
+
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "kan ikke �pne n�kkelknippet"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "feil ved lesing av �%s�: %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "signaturer opprettet s� langt: %lu\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:446
+#, fuzzy, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "feil ved lesing av �%s�: %s\n"
+
+#: common/exechelp.c:487
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+msgid "error running `%s': probably not installed\n"
+msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
-msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "feil ved lesing av �%s�: %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "feil ved lesing av n�kkelblokk: %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[Brukerid ikke funnet]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
+msgid "can't connect to `%s': %s\n"
+msgstr ""
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr ""
+
+#: common/simple-pwquery.c:389
+msgid "problem setting the gpg-agent options\n"
+msgstr ""
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+msgid "canceled by user\n"
+msgstr ""
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+msgid "problem with the agent\n"
+msgstr ""
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr ""
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "ja"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "jJ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "nei"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "avslutt"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "aA"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr "okay|okay"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:115
+msgid "cC"
+msgstr "cC"
 
 #: g10/armor.c:320
 #, c-format
@@ -379,163 +800,198 @@ msgid ""
 msgstr ""
 "quoted printable-tegn i armor - antakelig har en MTA med feil blitt brukt\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr ""
+
+#: g10/build-packet.c:962
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr ""
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr ""
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+#, fuzzy
+msgid "WARNING: invalid notation data found\n"
+msgstr "ingen gyldig OpenPGP-data funnet.\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr ""
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnummer %s oppdaget\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke gj�re dette i batchmodus\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[ikke satt]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr "mann"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr "dame"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "uspesifisert"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er forel�pig tillatt.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Feil: Det kombinerte navnet er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr "URL for � hente offentlig n�kkel: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Feil: URL er for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Feil: Logindata er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Feil: Privat DO for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 msgid "Language preferences: "
 msgstr "Spr�kpreferanser:"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig respons.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "n�kkeloperasjonen er umulig: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende n�kkel? (j/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsn�kler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende n�kler? (j/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -546,193 +1002,139 @@ msgstr ""
 "   PIN = �%s�     Admin PIN = �%s�\n"
 "Du b�r endre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturn�kkel\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsn�kkel\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsn�kkel\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "ukjent n�kkelbeskyttelsesalgoritme\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "hemmelige deler av n�kkelen er ikke tilgjengelig.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "avslutte denne menyen"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "vise admin-kommandoer"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "vise denne hjelpen"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "endre URL for � hente n�kkel"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "hente n�kkelen angitt i URL som er lagret i kortet"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "endre loginnavnet"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "endre spr�kpreferansene"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "endre kortholders kj�nn"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "vise et CA-fingeravtrykk"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "veksle tving-signatur-PIN-flagget"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "generere nye n�kler"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "meny for � endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "hemmelig n�kkel er ikke tilgjengelig"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-"Vennligst sett inn kortet og trykk p� enter eller tast inn �c� for � "
-"avbryte: "
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-"Vennligst fjern det n�v�rende kortet og sett inn kortet med serienummeret:\n"
-"   %.*s\n"
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr "Trykk p� enter n�r du er klar eller tast �c� for � avbryte: "
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr "Tast inn ny Admin-PIN: "
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr "Tast inn ny PIN: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr "Tast inn Admin-PIN: "
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr "Tast inn PIN: "
-
-#: g10/cardglue.c:937
-msgid "Repeat this PIN: "
-msgstr "Gjenta denne PIN: "
-
-#: g10/cardglue.c:952
-msgid "PIN not correctly repeated; try again"
-msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output virker ikke for denne kommandoen\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -772,48 +1174,48 @@ msgstr "det finnes en hemmelig n�kkel for offentlig n�kkel �%s�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "bruk valget �--delete-secret-keys� for � slette den f�rst.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan ikke bruke en symmetrisk ESK-pakke p� grunn av S2K-modusen\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "bruker cipher %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "�%s� er allerede komprimert\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: �%s� er en tom fil\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "du kan bare kryptere med RSA-n�kler med lengder p� 2048 bits eller mindre i "
 "--pgp2-modus\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leser fra �%s�\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "klarte ikke � bruke IDEA-algoritmen for alle n�klene du krypterer til.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -821,7 +1223,7 @@ msgstr ""
 "ADVARSEL: p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -830,164 +1232,197 @@ msgstr ""
 "ADVARSEL: tvang av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan ikke bruke %s i %s modus\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kryptert for: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterte data\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ADVARSEL: meldingen er kryptert med en svak n�kkel for den symmetriske "
 "cipher.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "problem ved h�ndtering av kryptert pakke\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "fjernutf�ring av programmer er ikke st�ttet\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "kan ikke opprette katalogen �%s�: %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "eksterne programkall er utkoblet p� grunn av utrygge rettigheter p� "
 "konfigurasjonsfila\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "denne plattformen krever midlertidige filer ved kall p� eksterne programmer\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kunne ikke utf�re program �%s�: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kunne ikke utf�re skallet �%s�: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfeil under kall p� eksternt program: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "unaturlig avslutning av eksternt program\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "klarte ikke � kj�re eksternt program\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "klarte ikke � lese reponsen fra eksternt program: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "ADVARSEL: klarte ikke � fjerne midlertidig fil (%s) �%s�: %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ADVARSEL: klarte ikke � fjerne midlertidig katalog �%s�: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 msgid "export signatures that are marked as local-only"
 msgstr "eksportere signaturer som er markert som bare-lokale"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:69
 msgid "remove the passphrase from exported subkeys"
 msgstr ""
 
-#: g10/export.c:69
+#: g10/export.c:71
 msgid "remove unusable parts from key during export"
 msgstr ""
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 msgid "exporting secret keys not allowed\n"
 msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�kkel %s: ikke beskyttet - hoppet over\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�kkel %s: PGP 2.x-aktig n�kkel - hoppet over\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "n�kkel %s: n�kkelmateriell p� kort - hoppet over\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "klarte ikke � fjerne beskyttelsen p� undern�kkelen: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ADVARSEL: hemmelig n�kkel %s har ikke en enkel SK-sjekksum\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: ingenting eksportert\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "for mange innslag i pk-cachen - utkoblet\n"
+
+#: g10/getkey.c:176
+msgid "[User ID not found]"
+msgstr "[Brukerid ikke funnet]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
+
+#: g10/getkey.c:2612
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
+
+#: g10/getkey.c:2659
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -995,127 +1430,128 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "liste n�kler"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "liste n�kler og signaturer"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "generere et nytt n�kkelpar"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "signere en n�kkel"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "signere en n�kkel lokalt"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "signere eller redigere en n�kkel"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "generere et opphevingssertifikat"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "oppdatere alle n�klene fra en n�kkelserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importere/flette n�kler"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "vis kortets status"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "endre data p� et kort"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "endre PIN p� et kort"
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "oppdatere tillitsdatabasen"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1125,51 +1561,47 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "bruk som outputfil"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "fyldig output"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "sp�r f�r overskriving"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppf�rsel"
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr "generere PGP 2.x-kompatible meldinger"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1609,7 @@ msgstr ""
 "@\n"
 "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1197,15 +1629,15 @@ msgstr ""
 " --list-keys [navn]         vise n�kler\n"
 " --fingerprint [navn]       vise fingeravtrykk\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1215,7 +1647,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1223,73 +1655,73 @@ msgstr ""
 "\n"
 "St�ttede algoritmer:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen �%"
 "s�\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1297,20 +1729,20 @@ msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
 "�%s�\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
 "�%s�\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1318,534 +1750,476 @@ msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
 "konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "MERK: ingen standard valgfil �%s�\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "valgfil �%s�: %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "leser valg fra �%s�\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "cipherutvidelse �%s� ble ikke lastet p� grunn av utrygge rettigheter\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:2826
-#, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr ""
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:2986
+#: g10/gpg.c:3010
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:3012
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [brukerid] [n�kkelknippe]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "for mange innslag i pk-cachen - utkoblet\n"
-
-#: g10/getkey.c:175
-msgid "[User ID not found]"
-msgstr "[Brukerid ikke funnet]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
-
-#: g10/getkey.c:2611
-#, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
-
-#: g10/getkey.c:2658
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "v�re noenlunde stille"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "hent n�klene fra dette n�kkelknippet"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1853,14 +2227,14 @@ msgstr ""
 "Bruksm�te: gpgv [valg] [filer]\n"
 "Sjekke signaturer mot kjente betrodde n�kler\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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:55
+#: g10/helptext.c:57
 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"
@@ -1868,16 +2242,16 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:66
+#: g10/helptext.c:68
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1891,23 +2265,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr ""
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr ""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1915,19 +2289,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1936,11 +2310,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:148
+#: g10/helptext.c:150
 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"
@@ -2008,28 +2382,28 @@ msgstr ""
 "\n"
 "Svar �0� dersom du ikke vet hva det riktige svaret er."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2037,13 +2411,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2052,36 +2426,36 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr ""
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2097,18 +2471,18 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 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:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr ""
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr ""
@@ -2141,489 +2515,484 @@ msgstr ""
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hopper over blokk av typen %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�kler behandlet hittil\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antall behandlet: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "nye n�kler som ble hoppet over: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "               uten brukerider: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                     importert: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                       uendret: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                nye brukerider: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               nye undern�kler: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                nye signaturer: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         nye n�kkelopphevinger: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "        leste hemmelige n�kler: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "   importerte hemmelige n�kler: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  uforandrede hemmelige n�kler: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                ikke importert: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         oppryddete signaturer: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "         oppryddete brukerider: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "                nye brukerider: %lu\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         �%s� preferanse for digestalgoritme %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�kkel %s: ingen brukerid\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�kkel %s: PKS-undern�kkel reparert\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�kkel %s: akseptert ikke-selvsignert brukerid �%s�\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�kkel %s: ingen gyldig brukerid\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dette kan skyldes en manglende selvsignatur\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�kkel %s: offentlig n�kkel ikke funnet: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til �%s�\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�kkel %s: offentlig n�kkel �%s� importert\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�kkel %s: stemmer ikke med v�r kopi\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�kkel %s: kan ikke finne original n�kkelblokk: %s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�kkel %s: kan ikke lese original n�kkelblokk: %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�kkel %s: �%s� 1 ny brukerid\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�kkel %s: �%s� 1 ny signatur\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�kkel %s: �%s� 1 ny undern�kkel\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�kkel %s: �%s� %d nye undern�kler\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�kkel %s: �%s� ikke endret\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel med ugyldig cipher %d - hoppet over\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemmelig n�kkel er ikke tillatt\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard hemmelig n�kkelknippe: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "n�kkel %s: hemmelig n�kkel importert\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "n�kkel %s: finnes allerede i hemmelig n�kkelknippe\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "n�kkel %s: hemmelig n�kkel ikke funnet: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "n�kkel %s: ingen offentlig n�kkel - kan ikke anvende opphevingssertifikat\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�kkel %s: ingen brukerid for signatur\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme for brukerid �%s�\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�kkel %s: ugyldig selvsignatur for brukerid �%s�\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "n�kkel %s: ingen undern�kkel for n�kkelbinding\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�kkel %s: fjernet flere undern�kkelbindinger\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�kkel %s: ingen undern�kkel for n�kkeloppheving\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�kkel %s: ugyldig undern�kkeloppheving\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�kkel %s: fjernet flere undern�kkelopphevinger\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "n�kkel %s: hoppet over brukerid �%s�\n"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "n�kkel %s: hoppet over undern�kkel\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�kkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�kkel %s: opphevingssertifikat p� feil plass - hoppet over\n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�kkel %s: undern�kkelsignatur p� feil plass - hoppet over\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�kkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "n�kkel %s: duplikert brukerid oppdaget - flettet sammen\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: n�kkel %s kan v�re opphevet: henter opphevingsn�kkel %s\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ADVARSEL: n�kkel %s kan v�re opphevet: opphevingsn�kkel %s ikke tilstede.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "n�kkelknippet �%s� ble opprettet\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "n�kkelblokkressurs �%s�: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[oppheving]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[selvsignatur]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 ubrukelig signatur\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ubrukelige signaturer\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur ble ikke sjekket p� grunn av en manglende n�kkel\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer ble ikke sjekket p� grunn av manglende n�kler\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur ble ikke sjekket p� grunn av en feil\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer ble ikke sjekket p� grunn av feil\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 brukerid uten gyldig selvsignatur ble oppdaget\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2634,62 +3003,62 @@ msgstr ""
 "andre brukeres n�kler (ved � se p� pass, sjekke fingeravtrykk fra\n"
 "forskjellige kilder, osv.)\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Jeg stoler marginalt\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Jeg stoler fullt\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Brukerid �%s� er opphevet."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du fortsatt sikker p� at du vil signerere den? (j/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Kunne ikke signere.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Brukerid �%s� er utg�tt."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Brukeriden �%s� er ikke selvsignert."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Brukeriden �%s� er signerbar."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "Signere den? (j/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2698,11 +3067,11 @@ msgstr ""
 "Selvsignaturen p� �%s�\n"
 "er en PGP 2.x-aktig signatur.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vil du forfremme den til en OpenPGP-selvsignatur? (j/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2711,11 +3080,11 @@ msgstr ""
 "Din n�v�rende signatur p� �%s�\n"
 "er utg�tt.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vil du utstede en ny signatur for � erstatte den som er utg�tt? (j/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2724,54 +3093,54 @@ msgstr ""
 "Din n�v�rede signatur p� �%s�\n"
 "er en lokal signatur.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vil du forfremme den til en fullt eksporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "�%s� var allerede lokalt signert av n�kkelen %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "�%s� var allerede signert av n�kkelen %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vil du likevel signere den igjen? (j/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ingenting � signere med n�kkelen %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Denne n�kkelen er utg�tt!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�kkelen utg�r den %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vil du at signaturen skal utg� p� samme tidspunkt? (J/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Du kan ikke lage en OpenPGP-signatur p� en PGP-2.x-n�kkel i --pgp2-modus.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dette ville gj�re n�kkelen ubrukelig i PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2781,31 +3150,31 @@ msgstr ""
 "tilh�rer den overnevnte personen?  Tast inn �0� dersom du ikke vet\n"
 "svaret.\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Jeg vil ikke svare.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Jeg har ikke sjekket i det hele tatt.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Jeg har gjort en vanlig sjekk.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Jeg har sjekket veldig n�ye.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt valg? (angi �?� for mer informasjon): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2814,267 +3183,267 @@ msgstr ""
 "Er du virkelig sikker p� at du vil signerere denne n�kkelen med din\n"
 "n�kkel �%s� (%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr "Dette vil v�re en selvsignatur.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-eksporterbar.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-opphevbar.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Signaturen vil bli markert som ikke-eksporterbar.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Signaturen vil bli markert som ikke-opphevbar.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr "Jeg har ikke sjekket denne n�kkelen i det hele tatt.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr "Jeg har sjekket denne n�kkelen p� vanlig m�te.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "Virkelig signere? (j/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Denne n�kkelen er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er lagret p� kort.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "N�kkelen er beskyttet.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�kkelen: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "Du �nsker ikke en passfrase - dette er sannsynligvis en *dum* id�!\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gj�re dette? (j/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "flytter en n�kkelsignatur til den rette plassen\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "lagre og avslutte"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 msgid "show key fingerprint"
 msgstr "vise n�kkelens fingeravtrykk"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "liste n�kler og brukerider"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "select subkey N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 msgid "check signatures"
 msgstr "sjekke signaturer"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 msgid "sign selected user IDs locally"
 msgstr "signerere utvalgte brukerider lokalt"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "sign selected user IDs with a trust signature"
 msgstr "signere utvalgte brukerider med en tillitssignatur"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "legge til en brukerid"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "legge til en fotoid"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 msgid "delete selected user IDs"
 msgstr "slette utvalgte brukerider"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 msgid "add a subkey"
 msgstr "legge til en undern�kkel"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 msgid "delete selected subkeys"
 msgstr "slette utvalgte undern�kler"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "legge til en opphevingsn�kkel"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 msgid "delete signatures from the selected user IDs"
 msgstr "slette signaturene fra de utvalgte brukeridene"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr "markere den valgte brukeriden som den prim�re"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 msgid "toggle between the secret and public key listings"
 msgstr "veksle mellom hemmelig og offentlig n�kkellisting"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "liste preferanser (ekspert)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "liste preferanser (fyldig)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 msgid "set preference list for the selected user IDs"
 msgstr "sette preferanseliste for de valgte brukeridene"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "sette URL for foretrukket n�kkelserver for de valgte brukeridene"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 msgid "set a notation for the selected user IDs"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "endre passfrasen"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "endre eiertilliten"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 msgid "revoke signatures on the selected user IDs"
 msgstr "oppheve signaturene p� de valgte brukeridene"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 msgid "revoke selected user IDs"
 msgstr "oppheve utvalgte brukerider"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 msgid "revoke key or selected subkeys"
 msgstr "oppheve n�kkel eller utvalgte undern�kler"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 msgid "enable key"
 msgstr "innkoble en n�kkel"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 msgid "disable key"
 msgstr "utkoble en n�kkel"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr "vise utvalgte fotoider"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "feil ved lesing av hemmelig n�kkelblokk �%s�: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Hemmelig n�kkel er tilgjengelig\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Vennligst bruk kommandoen �toggle� f�rst.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3082,549 +3451,554 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "N�kkelen er opphevet."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Virkelig signerere alle brukerider? (j/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Velg brukeriden som skal signeres\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Ukjent signaturtype �%s�\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Du m� velge minst en brukerid.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan ikke slette den siste brukeriden!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Virkelig fjerne alle valgte brukerider? (j/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 msgid "Really remove this user ID? (y/N) "
 msgstr "Virkelig fjerne denne brukeriden? (j/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr "Virkelig flytte prim�rn�kkelen? (j/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 msgid "You must select exactly one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan ikke �pne �%s�: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Feil ved lesing av sikkerhetskopiert n�kkel �%s�: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig slette denne n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Virkelig oppheve alle de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Virkelig oppheve denne brukeriden? (j/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig oppheve hele n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du virkelig oppheve de valgte undern�klene? (j/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig oppheve denne undern�kkelen? (j/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 msgid "Set preference list to:\n"
 msgstr "sette preferanseliste til:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Virkelig oppdatere preferansene for de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 msgid "Really update the preferences? (y/N) "
 msgstr "Virkelig oppdatere preferansene? (j/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 msgid "Save changes? (y/N) "
 msgstr "Lagre endringene? (j/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 msgid "Quit without saving? (y/N) "
 msgstr "Avslutte uten � lagre? (j/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "N�kkelen ble ikke endret, s� ingen oppdatering er n�dvendig.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "S�rtrekk: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Det er ingen preferanser for en PGP 2.x-aktig brukerid.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Denne n�kkelen ble opphevet den %s av %s med n�kkelen %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne n�kkelen kan bli opphevet av %s med n�kkelen %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, c-format
 msgid "expires: %s"
 msgstr "utg�r: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr "bruksm�te: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Denne n�kkelen har blitt utkoblet"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "utg�tt"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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:3011
+#: g10/keyedit.c:3012
 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at du vil legge den til? (j/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettet %d signatur.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 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:3352
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
 "N) "
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 msgid "Please select at most one subkey.\n"
 msgstr "Vennligst velg minst en undern�kkel.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at du vil slette den? (j/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk den %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 msgid " (non-revocable)"
 msgstr " (ikke-opphevbar)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "ingen hemmelig n�kkel\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "brukerid �%s� er allerede opphevet\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n"
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�kkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferansen %s er duplisert\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "for mange cipher-preferanser\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "for mange digest-preferanser\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "for mange kompresjons-preferanser\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ugyldig oppf�ring �%s� i preferansestreng\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "skriver direkte signatur\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "skriver n�kkelbindende signatur\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr "Signere"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr "Bekrefte"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 msgid "Encrypt"
 msgstr "Kryptere data"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr "Autentisere"
 
@@ -3632,109 +4006,109 @@ msgstr "Autentisere"
 # K og k for kryptering
 # A og a for autentisering
 # Q og q for avslutte
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil ha:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (bare signering)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (bare kryptering)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (bare signering)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (bare kryptering)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-n�kkelpar vil ha %u bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�kkelst�rrelse er %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3750,7 +4124,7 @@ msgstr ""
 "      <n>m = n�kkelen utg�r om n months\n"
 "      <n>y = n�kkelen utg�r om n years\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3766,38 +4140,38 @@ msgstr ""
 "      <n>m = signaturen utg�r om n months\n"
 "      <n>y = signaturen utg�r om n years\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "N�kkelen er gyldig for? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 msgid "Key does not expire at all\n"
 msgstr "N�kkel utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "N�kkel utg�r den %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utg�r den %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3805,11 +4179,11 @@ msgstr ""
 "Systemet ditt kan ikke vise datoer etter 2038.\n"
 "Likevel vil det bli h�ndtert korrekt opp til 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3825,44 +4199,44 @@ msgstr ""
 "    �Heinrich Heine (Der Dichter) <[email protected]>�\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Navnet kan ikke starte med et siffer\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navnet m� v�re minst 5 tegn langt\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruker tegnsettet �%s�.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3873,7 +4247,7 @@ msgstr ""
 "    �%s�\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
@@ -3889,23 +4263,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1997
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Vennligst korriger feilen f�rst\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3913,12 +4287,12 @@ msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -3930,7 +4304,7 @@ msgstr ""
 "hjelp av dette programmet og valget �--edit-key�.\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -3942,50 +4316,50 @@ msgstr ""
 "diskene jobbe) under primtallgenereringen; dette gir\n"
 "tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "N�kkelgenereringen ble avbrutt.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentlig n�kkel til �%s�\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver forel�pig hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -3994,13 +4368,13 @@ msgstr ""
 "kanskje � bruke kommandoen �--edit-key� for � generere en\n"
 "sekund�rn�kkel for dette form�let.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
 # Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4009,7 +4383,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4017,32 +4391,32 @@ msgstr ""
 "n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MERK: opprettelse av undern�kler for v3-n�kler er ikke i samsvar med "
 "OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 msgid "Really create? (y/N) "
 msgstr "Virkelig opprette? (j/N)"
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr ""
 
@@ -4070,615 +4444,588 @@ msgstr ""
 msgid "Keyring"
 msgstr "N�kkelknippe"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Fingeravtrykk for prim�rn�kkel:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "     Fingeravtrykk for undern�kkel:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Fingeravtrykk for prim�rn�kkel:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "      Fingeravstrykk for undern�kkel:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 msgid "      Key fingerprint ="
 msgstr " N�kkelfingeravtrykk ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr "      Serienummer for kort ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ADVARSEL: 2 filer med konfidensiell informasjon finnes.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "cacher n�kkelknippet �%s�\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu n�kler cachet s� langt (%lu signaturer)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu n�kler cachet (%lu signaturer)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ADVARSEL: n�kkelserver-valget �%s� er ikke i bruk p� denne plattformen\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr "utkoblet"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "n�kkelen �%s� ble ikke funnet p� n�kkelserveren\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 msgid "key not found on keyserver\n"
 msgstr "n�kkelen ble ikke funnet p� n�kkelserver\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "ber om n�kkelen %s fra %s server %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "ber om n�kkel %s fra %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s�ke etter navn fra %s server %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "s�ker etter navn fra %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s�ke etter �%s� fra %s server %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s�ker etter �%s� fra %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 msgid "no keyserver action!\n"
 msgstr "ingen handling for n�kkelserver!\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr "n�kkelserver sendte ikke VERSION\n"
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 msgid "keyserver timed out\n"
 msgstr "n�kkelserver svarte ikke tidsnok\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 msgid "keyserver internal error\n"
 msgstr "intern feil ved n�kkelserver\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikasjonsfeil med n�kkelserver: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � oppfriske n�kkel %s via %s: %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "oppfrisker 1 n�kkel fra %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "oppfrisker %d n�kler fra %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ADVARSEL: klarte ikke � parse URI %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "merkelig st�rrelse for en kryptert sesjonsn�kkel (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passfrase er generert med en ukjent digest-algoritme %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig n�kkel er %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig n�kkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kryptert med %u-bit %s-n�kkel, ID %s, opprettet %s\n"
 
 # Do we really need to translate this string.
 # The must some bug in the code.
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      �%s�\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-n�kkel, ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig n�kkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=�%.*s�\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 msgid "no signature found\n"
 msgstr "ingen signatur ble funnet\n"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruker %s n�kkel %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur laget %s ved hjelp av %s-n�kkel ID %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "N�kkel tilgjengelig ved: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra �%s�"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utg�tt signatur fra �%s�"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra �%s�"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka �%s�"
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utg�tt %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utg�r %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "bin�r"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr ""
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell offentlig n�kkel-algoritme %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "vennligst se %s for mer informasjon\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr ""
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1017
+#: g10/misc.c:1106
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg �%s�\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fila �%s� finnes. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 msgid "Overwrite? (y/N) "
 msgstr "Overskrive (j/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Tast inn nytt filnavn"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar at signert data er i �%s�\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurasjonsfil �%s� ble opprettet\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "ADVARSEL: valgene i �%s� er ikke aktive under denne kj�ringen\n"
 
-#: g10/openfile.c:424
-#, c-format
-msgid "directory `%s' created\n"
-msgstr "katalogen �%s� ble opprettet\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr ""
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr ""
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr ""
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr ""
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
@@ -4742,7 +5089,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Gjenta passfrase: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4751,38 +5098,34 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kan ikke �pne JPEG-fil �%s�: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Er du sikker p� at du vil bruke den? (j/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "�%s� er ikke et JPEG-fil\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr ""
 
@@ -5057,62 +5400,57 @@ msgstr "ingen gyldige adressater\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr ""
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "p�tvinging av kompresjonsalgoritme %s bryter med mottakerens preferanser\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTIS: hemmelig n�kkel %s utgikk den %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr ""
 
@@ -5224,88 +5562,88 @@ msgstr ""
 msgid "Is this okay? (y/N) "
 msgstr "Er dette i orden? (j/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr ""
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Ugyldig passfrase; vennligst pr�v igjen"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "svak n�kkel ble opprettet - pr�ver p� nytt\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "kan ikke unng� svak n�kkel for symmetrisk krypteringsalgorime; pr�vde %d "
 "ganger!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 
 # Er dette entallsformen av denne strengen?
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5314,7 +5652,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5322,54 +5660,54 @@ msgstr ""
 "n�kkel %s ble opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "n�kkel %s: ingen undern�kkel for undern�kkelopphevingssignatur\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�kkel %s: ingen undern�kkel for undern�kkelbindingssignatur\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:132
+#: g10/sign.c:133
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5386,11 +5724,11 @@ msgstr ""
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-signatur fra: �%s�\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5398,38 +5736,38 @@ msgstr ""
 "ADVARSEL: p�tvinging av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppet over �%s�: er duplikat\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppet over �%s�: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
@@ -5481,51 +5819,51 @@ msgstr "lesefeil ved �%s�: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan ikke opprette l�s for �%s�\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan ikke l�se �%s�\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
@@ -5534,78 +5872,78 @@ msgstr ""
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
@@ -5614,7 +5952,7 @@ msgstr ""
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
@@ -5778,316 +6116,1598 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 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:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "generell feil"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "du fant en feil ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "ukjent pakketype"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "ukjent versjon"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "signering mislyktes: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "ukjent pubkey-algoritme"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "ukjent digest-algoritme"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "ugyldig offentlig n�kkel"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "ugyldig hemmelig n�kkel"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "ugyldig signatur"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "sjekksumfeil"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "ugyldig passfrase"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "fant ikke offentlig n�kkel"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "ukjent kryptoalgoritme"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "kan ikke �pne n�kkelknippet"
+#: scd/app-openpgp.c:609
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "ugyldig pakke"
+#: scd/app-openpgp.c:1004
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "ugyldig beskyttelse"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr "respons inneholder ikke data om offentlig n�kkel\n"
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "det finnes ingen slik brukerid"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr "respons inneholder ikke RSA-modulus\n"
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "hemmelig n�kkel er ikke tilgjengelig"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "feil hemmelig n�kkel ble brukt"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN-callback returnerte en feil: %s\n"
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "ikke st�ttet"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "ugyldig n�kkel"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "feil ved lesing av fil"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "feil ved skriving av fil"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr "feil ved henting av CHV-status fra kort\n"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "ukjent kompresjonsalgoritme"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr "kort er permanent l�st!\n"
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "feil ved �pning av fil"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "feil ved opprettelse av fil"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr "|A|Admin PIN"
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "ugyldig passfrase"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr "|AN|Ny Admin PIN"
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "uimplementert pubkey-algoritme"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr "|N|Ny PIN"
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "uimplementert kryptoalgoritme"
+#: scd/app-openpgp.c:1535
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "feil ved henting av ny PIN: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "ukjent signaturklasse"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+msgid "error reading application data\n"
+msgstr "feil ved lesing av applikasjonsdata\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "feil med tillitsdatabasen"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+msgid "error reading fingerprint DO\n"
+msgstr "feil ved lesing av fingeravtrykk DO\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "ugyldig MPI"
+#: scd/app-openpgp.c:1601
+msgid "key already exists\n"
+msgstr "n�kkel finnes allerede\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "ressursgrense"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr "eksisterende n�kkel vil bli erstattet\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "ugyldig n�kkelknippe"
+#: scd/app-openpgp.c:1607
+msgid "generating new key\n"
+msgstr "generere en ny n�kkel\n"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "ugyldig sertifikat"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr "tidsstempel for opprettelse mangler\n"
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "vansired brukerid"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA-modulus mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "feil ved lukking av fil"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "feil ved omd�ping av fil"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA-primtall %s mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "feil ved sletting av fil"
+#: scd/app-openpgp.c:1866
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "uforventet data"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr "vennligst vent mens n�kkel blir generert ...\n"
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "konflikt mellom tidsstempler"
+#: scd/app-openpgp.c:1939
+msgid "generating key failed\n"
+msgstr "n�kkelgenerering mislyktes\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "ubrukelig pubkey algoritme"
+#: scd/app-openpgp.c:1942
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "fila finnes fra f�r av"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "svak n�kkel"
+#: scd/app-openpgp.c:2125
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "kortet st�tter ikke digestalgoritme %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "ugydig argument"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signaturer opprettet s� langt: %lu\n"
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "ugyldig URI"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "ust�ttet URI"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "nettverksfeil"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "ikke kryptert"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "ikke behandlet"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "leser valg fra �%s�\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "ubrukelig offentlig n�kkel"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "ubrukelig hemmelig n�kkel"
+#: scd/scdaemon.c:122
+msgid "|NAME|use NAME as ct-API driver"
+msgstr ""
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "feil med n�kkelserver"
+#: scd/scdaemon.c:123
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr ""
 
-#: util/errors.c:109
-msgid "canceled"
+#: scd/scdaemon.c:126
+msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: util/errors.c:110
-msgid "no card"
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
 msgstr ""
 
-#: util/errors.c:111
-msgid "no data"
-msgstr "ingen data"
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "vise admin-kommandoer"
+
+#: scd/scdaemon.c:191
+#, fuzzy
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... dette er en feil (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "du fant en feil ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "ja"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "jJ"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr ""
+
+#: sm/call-dirmngr.c:228
+#, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr ""
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr ""
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "Kan ikke �pne �%s�: %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "klarte ikke � lagre n�kkelen: %s\n"
+
+#: sm/certchain.c:607
+msgid "certificate has been revoked"
+msgstr ""
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "ugyldig sertifikat"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "N�kkel tilgjengelig ved: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "generere et opphevingssertifikat"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Denne n�kkelen er utg�tt!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "CA-fingeravtrykk: "
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "bekrefte en signatur"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA krever bruk av en 160-bit hashalgoritme\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "nei"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "[ikke satt]"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "Feil: ugyldig respons.\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "Feil: ugyldig respons.\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for brukeren:\n"
+"�%.*s�\n"
+"%u-bit %s n�kkel, ID %s, opprettet %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "ugyldig hashalgoritme �%s�\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Ikke en gyldig epostadresse\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "N�kkelgenerering mislyktes: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "feil ved lesing av n�kkelblokk: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "preferansen %s er duplisert\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "ingen gyldige adressater\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "feil ved opprettelse av passfrase: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[fil]|lage en signatur"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[fil]|lage en klartekstsignatur"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "liste hemmelige n�kler"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "ugyldig sertifikat"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "ugyldig sertifikat"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "ugyldig sertifikat"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "endre passfrasen"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "lage ASCII-beskyttet output"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr ""
+
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "use the default key as default recipient"
+msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "force v3 signatures"
+msgstr "sjekke signaturer"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr ""
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr ""
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:351
+#, fuzzy
+msgid "add this keyring to the list of keyrings"
+msgstr "hent n�klene fra dette n�kkelknippet"
+
+#: sm/gpgsm.c:352
+#, fuzzy
+msgid "add this secret keyring to the list"
+msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr ""
+
+#: sm/gpgsm.c:355
+#, fuzzy
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NAVN|kryptere for NAVN"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr ""
+
+#: sm/gpgsm.c:380
+#, fuzzy
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "ukjent kryptoalgoritme"
+
+#: sm/gpgsm.c:382
+#, fuzzy
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "%s signatur, digestalgoritme %s\n"
+
+#: sm/gpgsm.c:384
+#, fuzzy
+msgid "|N|use compress algorithm N"
+msgstr "ukjent kompresjonsalgoritme"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Bruksm�te: gpg [valg] [filer]\n"
+"signere, sjekke, kryptere eller dekryptere\n"
+"standard operasjon avhenger av inputdata\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "bruksm�te: gpg [valg] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "kan ikke opprette �%s�: %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "kan ikke aksere �%s�: %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Totalt antall behandlet: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "generere et opphevingssertifikat"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "feil ved opprettelse av passfrase: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "feil ved lesing av �%s�: %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "n�kkelknippet �%s� ble opprettet\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "klarte ikke � lagre n�kkelen: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+
+#: sm/keydb.c:1392
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "feil ved henting av ny PIN: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "feil ved lesing av �%s�: %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr ""
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Signatur opprettet %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "God signatur fra �%s�"
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                aka �%s�"
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "avslutt"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "aA"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
-msgstr "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
-msgstr "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
+msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
-msgstr "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
+msgstr ""
 
-#: util/miscutil.c:411
-msgid "cC"
-msgstr "cC"
+#: tools/gpg-connect-agent.c:126
+#, fuzzy
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "for lang linje"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "ukjent valg �%s�\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "signering mislyktes: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "feil ved lesing av �%s�: %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "bruksm�te: gpg [valg] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "fant ikke offentlig n�kkel"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Kommandoer:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "dekryptering mislyktes: %s\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "kryptere data"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [filnavn]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s er ikke tillatt sammen med %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "%s er ikke tillatt sammen med %s!\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "kan ikke opprette katalogen �%s�: %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "feil ved lesing av �%s�: %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "feil med �%s�: %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "fjernutf�ring av programmer er ikke st�ttet\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "kan ikke opprette �%s�: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "kan ikke opprette �%s�: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "oppdatering mislyktes: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "oppdatering mislyktes: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "oppdatering mislyktes: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "oppdatering mislyktes: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "ikke st�ttet"
+
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "kan ikke generere et primtall med pbits=%u qbits=%u\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "kan ikke generere et primtall med mindre enn %d bit\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "ingen entropy-innsamlingsmodul ble oppdaget\n"
+
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "kan ikke l�se �%s�: %s\n"
+
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "venter p� l�sing av �%s� ...\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "kan ikke stat() �%s�: %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "�%s� er ikke en vanlig fil - ignorert\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "merk: random_seed-fila er tom\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "ADVARSEL: ugyldig st�rrelse p� random_seed-fila - ikke brukt\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "kan ikke lese �%s�: %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "merk: random_seed-fila ble ikke oppdatert\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "kan ikke skrive �%s�: %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "kan ikke lukke �%s�: %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "ADVARSEL: bruke usikker tilfeldig-tall-generator!!\n"
+
+#~ 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 ""
+#~ "Denne tilfeldig-tall-generatoren er bare en omvei for � f� programmet\n"
+#~ "til � kj�re - den er p� ingen m�te en sterk RNG!\n"
+#~ "\n"
+#~ "IKKE BRUK NOE DATA GENERERT AV DETTE PROGRAMMET!!\n"
+
+#~ 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 ""
+#~ "Vennligst vent, entropy blir innsamlet.  Gj�r noe arbeid dersom det\n"
+#~ "hindrer deg fra � kjede deg, fordi arbeidet vil forbedre kvaliteten p�\n"
+#~ "entropyen.\n"
+
+#~ 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"
+#~ "Ikke nok tilfeldige byter tilgjengelig.  Vennligst gj�r noe annet\n"
+#~ "arbeid for � gi operativsystemet en sjanse til � samle mer entropy!\n"
+#~ "(Trenger %d flere byter)\n"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "hemmelig n�kkel er ikke tilgjengelig"
+
+#~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
+#~ msgstr ""
+#~ "Vennligst sett inn kortet og trykk p� enter eller tast inn �c� for � "
+#~ "avbryte: "
+
+#~ msgid ""
+#~ "Please remove the current card and insert the one with serial number:\n"
+#~ "   %.*s\n"
+#~ msgstr ""
+#~ "Vennligst fjern det n�v�rende kortet og sett inn kortet med "
+#~ "serienummeret:\n"
+#~ "   %.*s\n"
+
+#~ msgid "Hit return when ready or enter 'c' to cancel: "
+#~ msgstr "Trykk p� enter n�r du er klar eller tast �c� for � avbryte: "
+
+#~ msgid "Enter New Admin PIN: "
+#~ msgstr "Tast inn ny Admin-PIN: "
+
+#~ msgid "Enter New PIN: "
+#~ msgstr "Tast inn ny PIN: "
+
+#~ msgid "Enter Admin PIN: "
+#~ msgstr "Tast inn Admin-PIN: "
+
+#~ msgid "Enter PIN: "
+#~ msgstr "Tast inn PIN: "
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "                nye brukerider: %lu\n"
+
+#~ msgid "general error"
+#~ msgstr "generell feil"
+
+#~ msgid "unknown packet type"
+#~ msgstr "ukjent pakketype"
+
+#~ msgid "unknown version"
+#~ msgstr "ukjent versjon"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "ukjent pubkey-algoritme"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "ukjent digest-algoritme"
+
+#~ msgid "bad public key"
+#~ msgstr "ugyldig offentlig n�kkel"
+
+#~ msgid "bad secret key"
+#~ msgstr "ugyldig hemmelig n�kkel"
+
+#~ msgid "bad signature"
+#~ msgstr "ugyldig signatur"
+
+#~ msgid "checksum error"
+#~ msgstr "sjekksumfeil"
+
+#~ msgid "invalid packet"
+#~ msgstr "ugyldig pakke"
+
+#~ msgid "invalid armor"
+#~ msgstr "ugyldig beskyttelse"
+
+#~ msgid "no such user id"
+#~ msgstr "det finnes ingen slik brukerid"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "feil hemmelig n�kkel ble brukt"
+
+#~ msgid "bad key"
+#~ msgstr "ugyldig n�kkel"
+
+#~ msgid "file read error"
+#~ msgstr "feil ved lesing av fil"
+
+#~ msgid "file write error"
+#~ msgstr "feil ved skriving av fil"
+
+#~ msgid "file open error"
+#~ msgstr "feil ved �pning av fil"
+
+#~ msgid "file create error"
+#~ msgstr "feil ved opprettelse av fil"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "ugyldig passfrase"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "uimplementert pubkey-algoritme"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "uimplementert kryptoalgoritme"
+
+#~ msgid "unknown signature class"
+#~ msgstr "ukjent signaturklasse"
+
+#~ msgid "trust database error"
+#~ msgstr "feil med tillitsdatabasen"
+
+#~ msgid "resource limit"
+#~ msgstr "ressursgrense"
+
+#~ msgid "invalid keyring"
+#~ msgstr "ugyldig n�kkelknippe"
+
+#~ msgid "malformed user id"
+#~ msgstr "vansired brukerid"
+
+#~ msgid "file close error"
+#~ msgstr "feil ved lukking av fil"
+
+#~ msgid "file rename error"
+#~ msgstr "feil ved omd�ping av fil"
+
+#~ msgid "file delete error"
+#~ msgstr "feil ved sletting av fil"
+
+#~ msgid "unexpected data"
+#~ msgstr "uforventet data"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "konflikt mellom tidsstempler"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "ubrukelig pubkey algoritme"
+
+#~ msgid "file exists"
+#~ msgstr "fila finnes fra f�r av"
+
+#~ msgid "weak key"
+#~ msgstr "svak n�kkel"
+
+#~ msgid "invalid argument"
+#~ msgstr "ugydig argument"
+
+#~ msgid "bad URI"
+#~ msgstr "ugyldig URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "ust�ttet URI"
+
+#~ msgid "network error"
+#~ msgstr "nettverksfeil"
+
+#~ msgid "not encrypted"
+#~ msgstr "ikke kryptert"
+
+#~ msgid "not processed"
+#~ msgstr "ikke behandlet"
+
+#~ msgid "unusable public key"
+#~ msgstr "ubrukelig offentlig n�kkel"
+
+#~ msgid "unusable secret key"
+#~ msgstr "ubrukelig hemmelig n�kkel"
+
+#~ msgid "keyserver error"
+#~ msgstr "feil med n�kkelserver"
+
+#~ msgid "no data"
+#~ msgstr "ingen data"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "ADVARSEL: bruker usikkert minne!\n"
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... dette er en feil (%s:%d:%s)\n"
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "vennligst se http://www.gnupg.org/faq.html for mere informasjon\n"
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "ADVARSEL: bruker usikkert minne!\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operasjonen er ikke mulig uten initialisert sikkert minne\n"
+#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#~ msgstr "vennligst se http://www.gnupg.org/faq.html for mere informasjon\n"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(du kan ha brukt feil program for denne oppgaven)\n"
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "operasjonen er ikke mulig uten initialisert sikkert minne\n"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA krever bruk av en 160-bit hashalgoritme\n"
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(du kan ha brukt feil program for denne oppgaven)\n"
diff --git a/po/pl.po b/po/pl.po
index 64878e9e3..b48517191 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -24,304 +24,723 @@ msgstr ""
 "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-"
 "enc.c\n"
 
-#: cipher/primegen.c:121
+#: agent/call-pinentry.c:193
 #, 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"
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "linia zbyt d�uga\n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "nie mo�na otworzy� ,,%s''\n"
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "has�o zbyt d�ugie\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "b��d MPI"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "niepoprawne has�o"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "niepoprawne has�o"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "zapisuj� klucz tajny w '%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "nie mo�na sprawdzi� ,,%s'': %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr ",,%s'' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "uwaga: plik random_seed jest pusty\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr ""
-"OSTRZE�ENIE: niew�a�ciwy rozmiar pliku random_seed - nie zostanie u�yty\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "nie mo�na odczyta� ,,%s'': %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "b��d zapisu zbioru kluczy '%': %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "nie mo�na utworzy� ,,%s'': %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "nie mo�na zapisa� ,,%s'': %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
+
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
+
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "Podaj identyfikator u�ytkownika (user ID): "
+
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Powt�rz has�o: "
+
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: cipher/random.c:569
+#: agent/divert-scd.c:290
 #, c-format
-msgid "can't close `%s': %s\n"
-msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr ""
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
-"OSTRZE�ENIE: u�ywany generator liczb losowych\n"
-"nie jest kryptograficznie bezpieczny!!\n"
+"Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: cipher/random.c:815
-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"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "zmiana has�a klucza"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 msgstr ""
-"U�ywany generator liczb losowych jest atrap� wprowadzon� dla umo�liwienia\n"
-"normalnej kompilacji - nie jest kryptograficznie bezpieczny!\n"
-"\n"
-"JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ� SI� DO \n"
-"NORMALNEGO U�YTKU I NIE ZAPEWNIAJ� BEZPIECZE�STWA!!\n"
 
-#: cipher/rndegd.c:202
-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"
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "zmiana has�a klucza"
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"\n"
-"Brakuje mo�liwo�ci wygenerowania odpowiedniej liczby losowych bajt�w.\n"
-"Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
-"ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
+"@\n"
+"Opcje:\n"
+" "
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "z dodatkowymi informacjami"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "mniej komunikat�ww"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "szukanie kluczy na serwerze"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr ""
+"Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "uaktualnienie bazy zaufania"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "b��d podczas tworzenia has�a: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "plik opcji ,,%s'': %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "odczyt opcji z ,,%s''\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "b��d tworzenia `%s': %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "nie mo�na utworzy� %s: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "zapis zmian nie powi�d� si�: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "zapisuj� klucz tajny w '%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: katalog utworzony\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: nie mo�na utworzy� katalogu: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "b��d podczas tworzenia has�a: %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "\t%lu kluczy pomini�tych\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "b��d odczytu bloku kluczy: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: b��d odczytu pustego wpisu: %s\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr ",,%s'' ju� jest skompresowany\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "generacja nowej pary kluczy"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "niepoprawne has�o"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "Anuluj"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "tajne cz�ci klucza s� niedost�pne\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "b��d odczytu: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
+msgid "Yes"
+msgstr "tak"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Generacja klucza nie powiod�a si�: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "nie mo�na otworzy� pliku: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "podpis %s, skr�t %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
+
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "b��d tworzenia `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "%s: nie znaleziono u�ytkownika\n"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "problem z porozumiewaniem si� z agentem\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "problem agenta: zwr�ci� 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "anulowano przez u�ytkownika\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "problem agenta: zwr�ci� 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "tak"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "tT"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "nie"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "wyj�cie"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "wW"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "l"
 
 #: g10/armor.c:320
 #, c-format
@@ -400,178 +819,215 @@ msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przek�amanie wprowadzone przez serwer pocztowy\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+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 i podkre�lenia, \n"
+"i musi ko�czy� si� ,,=''\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "nieczytelne dla cz�owieka"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "brak klucza prywatnego"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "w�kl"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "w�kl"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "nie podano przyczyny"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "nie zosta� przetworzony"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizacja ustawie� klucza"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Odcisk klucza:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -579,210 +1035,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Klucz dost�pny w: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "brak klucza prywatnego"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-#, fuzzy
-msgid "Enter New Admin PIN: "
-msgstr "Podaj identyfikator u�ytkownika (user ID): "
-
-#: g10/cardglue.c:918
-#, fuzzy
-msgid "Enter New PIN: "
-msgstr "Podaj identyfikator u�ytkownika (user ID): "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-#, fuzzy
-msgid "Enter PIN: "
-msgstr "Podaj identyfikator u�ytkownika (user ID): "
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Powt�rz has�o: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "opcja --output nie dzia�a z tym poleceniem\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -825,224 +1226,259 @@ msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 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/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 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:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "szyfrem %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "OSTRZE�ENIE: wiadomo�� by�a szyfrowana kluczem s�abym szyfru symetrycznego.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "problem podczas obr�bki pakietu szyfrowego\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "odwo�ania do zewn�trznych program�w s� wy��czone\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary 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:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "nienaturalne zako�czenie pracy zewn�trznego programu\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "nie mo�na uruchomi� zewn�trznego programu\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, 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:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, 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/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "bezu�yteczny klucz prywatny"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, 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:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, 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:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[brak identyfikatora u�ytkownika]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+"Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
+
+#: g10/getkey.c:2659
+#, 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/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1050,128 +1486,129 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1181,51 +1618,47 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "z dodatkowymi informacjami"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1233,7 +1666,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1254,15 +1687,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1272,7 +1705,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1280,73 +1713,73 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, 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/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, 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/gpg.c:1282
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1354,21 +1787,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 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/gpg.c:1291
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 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/gpg.c:1294
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1376,557 +1809,497 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, 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/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "plik opcji ,,%s'': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "odczyt opcji z ,,%s''\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, 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/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, 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/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 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/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 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/gpg.c:2988
+#: g10/gpg.c:3012
 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, fuzzy, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, fuzzy, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, 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/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, 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/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[brak identyfikatora u�ytkownika]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, fuzzy, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr ""
-"Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
-
-#: g10/getkey.c:2658
-#, 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/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "mniej komunikat�ww"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "pobieranie kluczy z tego zbioru"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktowa� konfliktu datownik�w jako b��du"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1934,7 +2307,7 @@ msgstr ""
 "Sk�adnia: gpgm [opcje] [pliki]\n"
 "Sprawdzanie podpis�w ze znanych zaufanych kluczy\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1945,7 +2318,7 @@ msgstr ""
 "zaufania, i nie ma to nic wsp�lnego z tworzon� automatycznie sieci�\n"
 "certyfikat�w."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1957,18 +2330,18 @@ msgstr ""
 "tajne. Odpowiedz ,,tak'', je�li chcesz okre�li� ten klucz jako klucz\n"
 "do kt�rego masz absolutne zaufanie.\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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''."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1982,7 +2355,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1993,16 +2366,16 @@ msgstr ""
 "si�\n"
 "najpierw skonsultowa� z ekspertem od bezpiecze�stwa. "
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Wprowad� rozmiar klucza"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpowied� \"tak\" lub \"nie\"."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -2014,20 +2387,20 @@ msgstr ""
 "w�a�ciwej obs�ugi b��d�w - system pr�buje interpretowa� podan� warto��\n"
 "jako okres."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Nazwa w�a�ciciela klucza."
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "prosz� wprowadzi� opcjonalny ale wysoce doradzany adres e-mail"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Prosz� wprowadzi� opcjonalny komentarz"
 
 # OSTRZE�ENIE: nic nie zosta�o wyeksportowane!
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2041,11 +2414,11 @@ msgstr ""
 "O aby kontynuowa� tworzenie klucza.\n"
 "Q aby zrezygnowa� z tworzenia klucza."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2116,12 +2489,12 @@ msgstr ""
 "\n"
 "Je�li nie wiesz co odpowiedzie�, podaj \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Odpowiedz \"tak\", aby podpisa� WSZYSTKIE identyfikatory u�ytkownika."
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2129,11 +2502,11 @@ msgstr ""
 "Aby skasowa� ten identyfikator u�ytkownika (co wi��e si� ze utrat�\n"
 "wszystkich jego po�wiadcze�!) nale�y odpowiedzie� ,,tak''."
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Aby skasowa� podklucz nale�y odpowiedzie� \"tak\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2143,7 +2516,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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2156,13 +2529,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:211
+#: g10/helptext.c:213
 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 ze zbioru kluczy."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2176,7 +2549,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:223
+#: g10/helptext.c:225
 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"
@@ -2186,30 +2559,30 @@ msgstr ""
 "ustawienia. Data na odpowiednich podpisach zostane przesuni�ta do przodu o\n"
 "jedn� sekund�. \n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "Podaj nazw� pliku kt�rego dotyczy ten podpis"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 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:250
+#: g10/helptext.c:252
 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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2236,7 +2609,7 @@ msgstr ""
 "      Identyfikator u�ytkownika (najcz�ciej adres e-mail przesta� by� \n"
 "      poprawny.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2246,11 +2619,11 @@ msgstr ""
 "uniewa�nienia. Opis powinien byc zwi�z�y. \n"
 "Pusta linia ko�czy wprowadzanie tekstu.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Pomoc niedost�pna"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o ,,%s''"
@@ -2286,500 +2659,495 @@ msgstr "bezu�yteczny klucz prywatny"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pomini�tych nowych kluczy: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "      nie w��czono do zbioru: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, 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:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, 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:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, fuzzy, c-format
 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, 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:1203
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
 "              uniwa�nienia\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, 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:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %08lX: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, 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:1389
+#: g10/import.c:1388
 #, 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:1391
+#: g10/import.c:1390
 #, 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:1409
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pomini�ty\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: pomini�to certyfikat uniewa�nienia umieszczony \n"
 "              w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, 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:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 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:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, 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:1788
+#: g10/import.c:1787
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %08lX.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 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:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, 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:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika niepodpisany tym samym kluczem\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2792,63 +3160,63 @@ msgstr ""
 "z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = mam ograniczone zaufanie\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = mam pe�ne zaufanie\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2857,11 +3225,11 @@ msgstr ""
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem z�o�onym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 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:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2870,11 +3238,11 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "przekroczy� dat� wa�no�ci.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2883,56 +3251,56 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 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:780
+#: g10/keyedit.c:781
 #, 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:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Czy na pewno chcesz to podpisa�? (t/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa�no�� tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 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� kluczy PGP 2.x podpisami OpenPGP.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2941,32 +3309,32 @@ msgstr ""
 "Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
 "Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2975,99 +3343,99 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3075,11 +3443,11 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3087,209 +3455,209 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3297,242 +3665,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nieznana klasa podpisu"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Adnotacja: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3540,19 +3908,19 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "data"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3561,7 +3929,7 @@ msgstr ""
 "             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:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3570,54 +3938,54 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3627,372 +3995,377 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 #, 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:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 #, fuzzy
 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %08lX nie jest skro�nie podpisany\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, 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:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ustawienie %c%lu powtarza si�\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpo�redniego\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "podpis"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "szyfrowanie danych"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, 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:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4008,7 +4381,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:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4024,40 +4397,40 @@ 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:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres wa�no�ci podpisu? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s traci wa�no��: %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4065,12 +4438,12 @@ 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:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4087,44 +4460,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 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:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4135,7 +4508,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
@@ -4152,37 +4525,37 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1997
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
 "czy (W)yj�� z programu ? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 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/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4194,7 +4567,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4210,50 +4583,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4262,12 +4635,12 @@ msgstr ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
 "mo�na doda� do niego podklucz szyfruj�cy.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4275,7 +4648,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4283,32 +4656,32 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "nigdy     "
 
@@ -4336,629 +4709,602 @@ msgstr "Adnotacje podpisu: "
 msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "      Odcisk podklucza:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "sprawdzanie zbioru kluczy ,,%s''\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "wy�kl"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "%d - dziwny rozmiar jak na zaszyfrowany klucz sesyjny\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomoc� %lu hase�\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym has�em\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "szyfr IDEA nie jest dost�pny, pr�ba u�ycia %s zamiast\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go wczyta�\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:122
-#, 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:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algorytm szyfruj�cy nie jest zaimplementowany"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = potrzebuj� wi�cej informacji\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Plik ,,%s'' ju� istnieje. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nieznana ko�c�wka nazwy\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Nazwa pliku"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj�cie standardowe\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "nowy plik ustawie� ,,%s'' zosta� utworzony\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: katalog utworzony\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 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:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem z agentem - zostaje wy��czony\n"
@@ -5024,7 +5370,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Powt�rz has�o: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5038,39 +5384,35 @@ msgstr ""
 "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:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Nazwa pliku ze zdj�ciem w formacie JPEG: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr ",,%s'' nie jest plikiem JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Czy zdj�cie jest w porz�dku? (t/N/w) "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "nie mo�na wy�wietli� zdj�cia!\n"
 
@@ -5354,61 +5696,56 @@ 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:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "b��d tworzenia `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "adresat anonimowy; sprawdzanie %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste�my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algorytm szyfruj�cy %d%s jest nieznany, lub zosta� wy��czony\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, 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:302
+#: g10/pubkey-enc.c:305
 #, 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:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
@@ -5536,91 +5873,91 @@ msgstr "(nie podano)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Informacje poprawne? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "tajne cz�ci klucza s� niedost�pne\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, 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:72
+#: g10/seckey-cert.c:74
 #, 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:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Niepoprawne has�o; prosz� spr�bowa� ponownie"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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:366
+#: g10/seckey-cert.c:406
 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/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "wygenerowano s�aby klucz - operacja zostaje powt�rzona\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "OSTRZE�ENIE: konflikt skr�t�w podpis�w w wiadomo�ci\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, fuzzy, c-format
 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:113
+#: g10/sig-check.c:119
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "OSTRZE�ENIE: podklucz podpisuj�cy %08lX jest niepoprawnie skro�nie "
 "podpisany\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 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:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 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:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5628,7 +5965,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5636,55 +5973,55 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, 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:287
+#: g10/sig-check.c:298
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "podpis z�o�ony kluczem %08lX uznany za niewa�ny z powodu nieznanego bitu "
 "krytycznego\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, fuzzy, c-format
 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:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "nie mo�na umie�ci� adnotacji w podpisach kluczy sk�adanych kluczami PGP 2.x\n"
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5692,7 +6029,7 @@ 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:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5711,52 +6048,52 @@ msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
 "podpis�w\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap� \n"
 "generatora liczb losowych!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "pomini�ty ,,%s'': duplikat\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "pomini�ty ,,%s'': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5816,51 +6153,51 @@ msgstr "b��d odczytu: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod�a si�: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
@@ -5869,78 +6206,78 @@ msgstr "%s: baza zaufania utworzona\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "UWAGA: nie mo�na zapisywa� bazy zaufania\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, 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:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: b��d odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: b��d zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: funkcja lseek() zawiod�a: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� ,,gpg --fix-trustdb''.\n"
@@ -5950,7 +6287,7 @@ msgstr ""
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linia d�u�sza ni� %d znak�w\n"
@@ -6119,7 +6456,7 @@ msgstr ""
 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:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6129,346 +6466,1630 @@ msgstr ""
 "Nale�y pami�ta� o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
 "argumentu linii polece�.\n"
 
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, 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"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "b��d og�lny"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "nieznany typ pakietu"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "nieznana wersja"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "nieznany algorytm asymetryczny"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "nieznany algorytm skr�tu"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr "ustawienie opcji �ledzenia wykonania programu"
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "niepoprawny klucz publiczny"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "niepoprawny klucz prywatny"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "niepoprawny podpis"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "b��d sumy kontrolnej"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "niepoprawne has�o"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "brak klucza publicznego"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "nieznany algorytm szyfruj�cy"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "otwarcie zbioru kluczy jest niemo�liwe"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "niepoprawny pakiet"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "b��d w opakowaniu ASCII"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "brak takiego identyfikatora u�ytkownika."
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "brak klucza prywatnego"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "zosta� u�yty niew�a�ciwy klucz prywatny"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "nie jest obs�ugiwany"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "niepoprawny klucz"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "b��d przy odczycie pliku"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "b��d przy zapisie pliku"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "nieznany algorytm kompresji"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "b��d przy otwieraniu pliku."
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "b��d przy tworzeniu pliku"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "niepoprawne d�ugie has�o"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algorytm szyfrowania z kluczem publicznym nie jest zaimplementowany"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "algorytm szyfruj�cy nie jest zaimplementowany"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "nieznana klasa podpisu"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "b��d w bazie zaufania"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "b��d MPI"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "ograniczenie zasob�w"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "b��d w zbiorze kluczy"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "generacja nowej pary kluczy"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "niepoprawny certyfikat"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "b��d formatu identyfikatora u�ytkownika"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "b��d przy zamykaniu pliku"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "b��d przy zmianie nazwy pliku"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "b��d przy usuwaniu pliku"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "nieoczekiowane dane"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "konflikt datownik�w"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "nieu�yteczny algorytm asymetryczny"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "plik ju� istnieje"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "klucz s�aby"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "podpis %s, skr�t %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "b��dny argument"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "niepoprawny URI"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "URI nie jest obs�ugiwany"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "b��d sieci"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "nie zaszyfrowany"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "nie zosta� przetworzony"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "odczyt opcji z ,,%s''\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "bezu�yteczny klucz publiczny"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "bezu�yteczny klucz prywatny"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "b��d serwera kluczy"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "Anuluj"
+msgid "do not use the internal CCID driver"
+msgstr "bez odwo�a� do terminala"
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "nie zaszyfrowany"
+msgid "allow the use of admin card commands"
+msgstr "sprzeczne polecenia\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "brak podpisanych danych\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Wywo�anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... to jest b��d programu (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "tak"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "tT"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "nie mo�na otworzy� ,,%s'': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "zapisuj� klucz tajny w '%s'\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "UWAGA: klucz zosta� uniewa�niony"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "Poprawny certyfikat"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Klucz dost�pny w: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Poprawny certyfikat"
+
+#: sm/certchain.c:713
+#, fuzzy, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "b��d przy odczycie certyfikatu: %s\n"
+
+#: sm/certchain.c:729
+#, fuzzy
+msgid "certificate not yet valid"
+msgstr "Poprawne uniewa�nienie certyfikatu"
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "b��d przy odczycie certyfikatu: %s\n"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
+"\n"
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "Odcisk klucza:"
+
+#: sm/certchain.c:860
+#, fuzzy
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+"Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
+"\n"
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+#, fuzzy
+msgid "certificate chain too long\n"
+msgstr "Poprawne uniewa�nienie certyfikatu"
+
+#: sm/certchain.c:913
+#, fuzzy
+msgid "issuer certificate not found"
+msgstr "Poprawne uniewa�nienie certyfikatu"
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "sprawdzenie podpisu"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+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"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "nie"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "nieznany"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "b��d: niew�a�ciwy odcisk klucza\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "b��d: niew�a�ciwy odcisk klucza\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Musisz poda� has�o aby odbezpieczy� klucz tajny u�ytkownika:\n"
+"\"%.*s\".\n"
+"Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "To nie jest poprawny adres poczty elektronicznej\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Generacja klucza nie powiod�a si�: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "b��d odczytu bloku kluczy: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "podw�jny certyfikat - usuni�ty"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "podw�jny certyfikat - usuni�ty"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(nie podano)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "b��d zapisu zbioru kluczy '%': %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[plik]|z�o�enie podpisu"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "lista kluczy prywatnych"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "Poprawne uniewa�nienie certyfikatu"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "Poprawny certyfikat"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "Poprawny certyfikat"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "zmiana has�a klucza"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "opakowanie ASCII pliku wynikowego"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "domy�lny klucz jest domy�lnym adresatem"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "bez odwo�a� do terminala"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "wymuszenie trzeciej wersji formatu podpis�w"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "do szyfrowania b�dzie u�ywany MDC"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "tryb wsadowy: �adnych pyta�"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "dodanie zbioru kluczy do u�ywanych"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "dodanie zbioru kluczy tajnych do u�ywanych"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAZWA|ustawienie NAZWA jako domy�lnego klucza prywatnego"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NAZWA| strona kodowa wy�wietlanego tekstu"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAZWA|wymuszenie algorytmu szyfruj�cego NAZWA"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAZWA|wymuszenie algorytmu skr�tu  NAZWA"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|wymuszenie algorytmu kompresji N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Wywo�anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sk�adnia: gpg [opcje] [pliki]\n"
+"podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
+"domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "spos�b u�ycia: gpgm [opcje]"
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "zapis do '%s'\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Og�em przetworzonych kluczy: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "Poprawny certyfikat"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "un? problem przy sprawdzaniu uniewa�nienia: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "b��d: niew�a�ciwy odcisk klucza\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Wa�no�� podpisu wygas�a %s.\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Poprawny podpis z�o�ony przez \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                        alias \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "wyj�cie"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "wW"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "l"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "linia zbyt d�uga\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "nieznany domy�lny adresat ,,%s''\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+#, fuzzy
+msgid "Options useful for debugging"
+msgstr "umo�liwienie pe�nego �ledzenia programu"
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "OSTRZE�ENIE: nie mo�na zabezpieczy� u�ywanej pami�ci!\n"
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "wywo�anie: gpg [opcje]"
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "brak klucza publicznego"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Polecenia:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "odszyfrowanie poprawne\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "odszyfrowanie poprawne\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [plik]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "Nie wolno u�ywa� %s z %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: util/secmem.c:98
-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"
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "odwo�ania do zewn�trznych program�w s� wy��czone\n"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "nie mo�na utworzy� %s: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "nie mo�na utworzy� %s: %s\n"
+
+#: tools/symcryptrun.c:606
+#, fuzzy, c-format
+msgid "could not fork: %s\n"
+msgstr "%s: nie znaleziono u�ytkownika %s\n"
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "zapis zmian nie powi�d� si�: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "zapis zmian nie powi�d� si�: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "zapis zmian nie powi�d� si�: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "zapis zmian nie powi�d� si�: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "nie mo�na utworzy� ,,%s'': %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "nie mo�na utworzy� ,,%s'': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
+
+#, fuzzy
+#~ 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"
+
+#~ 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"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "nie mo�na otworzy� ,,%s''\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "zapisuj� klucz tajny w '%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "nie mo�na sprawdzi� ,,%s'': %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr ",,%s'' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "uwaga: plik random_seed jest pusty\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr ""
+#~ "OSTRZE�ENIE: niew�a�ciwy rozmiar pliku random_seed - nie zostanie u�yty\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "nie mo�na odczyta� ,,%s'': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "nie mo�na zapisa� ,,%s'': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
 #~ msgstr ""
-#~ "Algorytm DSA wymaga u�ycia algorytmu skr�tu daj�cego 160-bitowy wynik.\n"
+#~ "OSTRZE�ENIE: u�ywany generator liczb losowych\n"
+#~ "nie jest kryptograficznie bezpieczny!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "wi�cej informacji jest tutaj: http://www.gnupg.org/why-not-idea.html\n"
+#~ "U�ywany generator liczb losowych jest atrap� wprowadzon� dla "
+#~ "umo�liwienia\n"
+#~ "normalnej kompilacji - nie jest kryptograficznie bezpieczny!\n"
+#~ "\n"
+#~ "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ� SI� DO \n"
+#~ "NORMALNEGO U�YTKU I NIE ZAPEWNIAJ� BEZPIECZE�STWA!!\n"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "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 ""
-#~ "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i "
-#~ "podkre�lenia, \n"
-#~ "i musi ko�czy� si� ,,=''\n"
+#~ "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"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
+#~ 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"
+#~ "Brakuje mo�liwo�ci wygenerowania odpowiedniej liczby losowych bajt�w.\n"
+#~ "Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
+#~ "ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
+#~ msgid "card reader not available\n"
+#~ msgstr "brak klucza prywatnego"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
+#, fuzzy
+#~ msgid "Enter New PIN: "
+#~ msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
+#, fuzzy
+#~ msgid "Enter PIN: "
+#~ msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#~ msgid "not human readable"
-#~ msgstr "nieczytelne dla cz�owieka"
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
+
+#~ msgid "general error"
+#~ msgstr "b��d og�lny"
+
+#~ msgid "unknown packet type"
+#~ msgstr "nieznany typ pakietu"
+
+#~ msgid "unknown version"
+#~ msgstr "nieznana wersja"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "nieznany algorytm asymetryczny"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "nieznany algorytm skr�tu"
+
+#~ msgid "bad public key"
+#~ msgstr "niepoprawny klucz publiczny"
+
+#~ msgid "bad secret key"
+#~ msgstr "niepoprawny klucz prywatny"
+
+#~ msgid "bad signature"
+#~ msgstr "niepoprawny podpis"
+
+#~ msgid "checksum error"
+#~ msgstr "b��d sumy kontrolnej"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "nieznany algorytm szyfruj�cy"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "otwarcie zbioru kluczy jest niemo�liwe"
+
+#~ msgid "invalid packet"
+#~ msgstr "niepoprawny pakiet"
+
+#~ msgid "invalid armor"
+#~ msgstr "b��d w opakowaniu ASCII"
+
+#~ msgid "no such user id"
+#~ msgstr "brak takiego identyfikatora u�ytkownika."
+
+#~ msgid "secret key not available"
+#~ msgstr "brak klucza prywatnego"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "zosta� u�yty niew�a�ciwy klucz prywatny"
+
+#~ msgid "not supported"
+#~ msgstr "nie jest obs�ugiwany"
+
+#~ msgid "bad key"
+#~ msgstr "niepoprawny klucz"
+
+#~ msgid "file read error"
+#~ msgstr "b��d przy odczycie pliku"
+
+#~ msgid "file write error"
+#~ msgstr "b��d przy zapisie pliku"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "nieznany algorytm kompresji"
+
+#~ msgid "file open error"
+#~ msgstr "b��d przy otwieraniu pliku."
+
+#~ msgid "file create error"
+#~ msgstr "b��d przy tworzeniu pliku"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "niepoprawne d�ugie has�o"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algorytm szyfrowania z kluczem publicznym nie jest zaimplementowany"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "algorytm szyfruj�cy nie jest zaimplementowany"
+
+#~ msgid "unknown signature class"
+#~ msgstr "nieznana klasa podpisu"
+
+#~ msgid "trust database error"
+#~ msgstr "b��d w bazie zaufania"
+
+#~ msgid "resource limit"
+#~ msgstr "ograniczenie zasob�w"
+
+#~ msgid "invalid keyring"
+#~ msgstr "b��d w zbiorze kluczy"
+
+#~ msgid "bad certificate"
+#~ msgstr "niepoprawny certyfikat"
+
+#~ msgid "malformed user id"
+#~ msgstr "b��d formatu identyfikatora u�ytkownika"
+
+#~ msgid "file close error"
+#~ msgstr "b��d przy zamykaniu pliku"
+
+#~ msgid "file rename error"
+#~ msgstr "b��d przy zmianie nazwy pliku"
+
+#~ msgid "file delete error"
+#~ msgstr "b��d przy usuwaniu pliku"
+
+#~ msgid "unexpected data"
+#~ msgstr "nieoczekiowane dane"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "konflikt datownik�w"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "nieu�yteczny algorytm asymetryczny"
+
+#~ msgid "file exists"
+#~ msgstr "plik ju� istnieje"
+
+#~ msgid "weak key"
+#~ msgstr "klucz s�aby"
+
+#~ msgid "invalid argument"
+#~ msgstr "b��dny argument"
+
+#~ msgid "bad URI"
+#~ msgstr "niepoprawny URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "URI nie jest obs�ugiwany"
+
+#~ msgid "network error"
+#~ msgstr "b��d sieci"
+
+#~ msgid "not encrypted"
+#~ msgstr "nie zaszyfrowany"
+
+#~ msgid "not processed"
+#~ msgstr "nie zosta� przetworzony"
+
+#~ msgid "unusable public key"
+#~ msgstr "bezu�yteczny klucz publiczny"
+
+#~ msgid "unusable secret key"
+#~ msgstr "bezu�yteczny klucz prywatny"
+
+#~ msgid "keyserver error"
+#~ msgstr "b��d serwera kluczy"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "nie zaszyfrowany"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "brak podpisanych danych\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... to jest b��d programu (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "OSTRZE�ENIE: nie mo�na zabezpieczy� u�ywanej pami�ci!\n"
+
+#~ 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"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
+
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6506,10 +8127,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "Brak identyfikatora u�ytkownika dla klucza.\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "b��d podczas tworzenia has�a: %s\n"
-
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "niepoprawne has�o, lub nieznany algorytm szyfruj�cy (%d)\n"
 
@@ -6522,18 +8139,9 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "serwer nie chce pisa� deskryptora dla agenta\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "problem z porozumiewaniem si� z agentem\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "has�o zbyt d�ugie\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "b��dna odpowied� agenta\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "problem agenta: zwr�ci� 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "wyb�r podklucza N"
 
@@ -6787,20 +8395,9 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ "u�ywanie tego szyfru jest odradzane; nale�y u�ywa� standardowych "
 #~ "szyfr�w!\n"
 
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "zapis do '%s'\n"
-
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "niestety, to nie dzia�a w trybie wsadowym\n"
 
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "nie mo�na utworzy� ,,%s'': %s\n"
-
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "nie mo�na otworzy� pliku: %s\n"
@@ -6846,9 +8443,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: OSTRZE�ENIE: plik jest pusty\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "nie mo�na otworzy� %s: %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
 #~ msgstr " %d = mam ograniczone zaufanie\n"
@@ -6888,9 +8482,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: nie mo�na utworzy�: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: nie mo�na utworzy� katalogu: %s\n"
-
 #~ 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 ,,"
@@ -6899,9 +8490,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "Nie mo�na otworzy� zdj�cia ,,%s'': %s.\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "nie mo�na otworzy� pliku: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "b��d: brak dwukropka\n"
 
@@ -6917,9 +8505,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "un- fa�szywy certyfikat uniewa�nienia\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "un? problem przy sprawdzaniu uniewa�nienia: %s\n"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [wygasa :%s]"
@@ -6931,9 +8516,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "[uniewa�niony]"
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "nie mo�na utworzy� %s: %s\n"
-
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
@@ -6977,18 +8559,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ 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"
 
@@ -6998,48 +8568,18 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ 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 "|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 "|[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"
 
@@ -7058,15 +8598,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ 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"
 
@@ -7115,9 +8646,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\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"
 
@@ -7365,13 +8893,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ "\n"
 
 #~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
-#~ "\n"
-
-#~ msgid ""
 #~ "No trust values changed.\n"
 #~ "\n"
 #~ msgstr ""
@@ -7387,12 +8908,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "Czy na pewno chcesz stworzy� klucz do szyfrowania i podpisywania? "
 
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: nie znaleziono u�ytkownika %s\n"
-
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "b��d przy odczycie certyfikatu: %s\n"
-
 #~ msgid "too many entries in unk cache - disabled\n"
 #~ msgstr "zbyt wiele wpis�w w buforze nieznanych kluczy - wy��czony\n"
 
@@ -7402,9 +8917,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "secret key %08lX not imported (use %s to allow for it)\n"
 #~ msgstr "klucz tajny %08lX nie zosta� wczytany (aby to zrobi� u�yj %s)\n"
 
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: nie znaleziono u�ytkownika\n"
-
 #~ msgid "assuming bad MDC due to an unknown critical bit\n"
 #~ msgstr ""
 #~ "przyj�to niepoprawno�� MDC z powonu ustawienia nieznanego bitu "
@@ -7463,12 +8975,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "Invalid user ID revocation"
 #~ msgstr "Niepoprawne uniewa�nienie identyfikatora u�ytkownika"
 
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Poprawne uniewa�nienie certyfikatu"
-
-#~ msgid "Good certificate"
-#~ msgstr "Poprawny certyfikat"
-
 #~ msgid "Invalid certificate revocation"
 #~ msgstr "Niepoprawne uniewa�nienie certyfikatu"
 
@@ -7478,9 +8984,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "zapis o podpisach %lu[%d] wskazuje na z�y wpis.\n"
 
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "podw�jny certyfikat - usuni�ty"
-
 #~ msgid "tdbio_search_dir failed: %s\n"
 #~ msgstr "Procedura tdbio_search_dir nie powiod�a si�: %s\n"
 
@@ -7502,9 +9005,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "\t%lu due to new pubkeys\n"
 #~ msgstr "        %lu z powodu nowych podkluczy\n"
 
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu kluczy pomini�tych\n"
-
 #~ msgid "\t%lu keys updated\n"
 #~ msgstr "\t%lu kluczy uaktualnionych\n"
 
@@ -7558,12 +9058,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "odszyfrowuj�cy klucz tajny do jest niedost�pny\n"
 
-#~ msgid "set debugging flags"
-#~ msgstr "ustawienie opcji �ledzenia wykonania programu"
-
-#~ msgid "enable full debugging"
-#~ msgstr "umo�liwienie pe�nego �ledzenia programu"
-
 #~ msgid "do not write comment packets"
 #~ msgstr "nie zapisywa� pakiet�w z komentarzem"
 
@@ -7592,9 +9086,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "can't lock keyring `%': %s\n"
 #~ msgstr "nie mo�na zablokowa� zbioru kluczy publicznych: %s\n"
 
-#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "b��d zapisu zbioru kluczy '%': %s\n"
-
 #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 #~ msgstr ""
 #~ "UWAGA: wpis podpisu %lu[%d] znajduje si� w li�cie domy�lnej %lu,\n"
@@ -7806,12 +9297,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "Can't check MDC: %s\n"
 #~ msgstr "Sprawdzenie MDC niemo�liwe: %s\n"
 
-#~ msgid "Usage: gpgm [options] [files] (-h for help)"
-#~ msgstr "Wywo�anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
-
-#~ msgid "usage: gpgm [options] "
-#~ msgstr "spos�b u�ycia: gpgm [opcje]"
-
 #~ msgid "chained sigrec %lu has a wrong owner\n"
 #~ msgstr "powi�zany rekord podpisu %lu ma niew�a�ciwego w�a�ciciela\n"
 
diff --git a/po/pt.po b/po/pt.po
index a6eb5527e..11939ae32 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -17,295 +17,724 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
 msgstr ""
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Por favor digite a frase secreta \n"
+
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "frase secreta demasiado longa\n"
+
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "frase secreta demasiado longa\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Caracter inv�lido no nome\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
 msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "nenhum m�dulo de recolha de entropia detectado\n"
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "MPI incorreto"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "imposs�vel abrir `%s'\n"
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "frase secreta incorrecta"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "frase secreta incorrecta"
 
-#: cipher/random.c:408
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "a escrever chave privada para `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "imposs�vel criar `%s': %s\n"
+
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:458
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "imposs�vel 'stat' a `%s': %s\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
+
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
+
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
+
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "remo��o do bloco de chave falhou: %s\n"
+
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
+
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Por favor digite a frase secreta \n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' n�o � um ficheiro normal - ignorado\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "nota: random_seed est� vazia\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
+#: agent/divert-scd.c:217
+msgid "Admin PIN"
 msgstr ""
-"AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "imposs�vel ler `%s': %s\n"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Repita a frase secreta: "
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "nota: ficheiro random_seed n�o actualizado\n"
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: agent/divert-scd.c:290
 #, c-format
-msgid "can't create `%s': %s\n"
-msgstr "imposs�vel criar `%s': %s\n"
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr ""
 
-#: cipher/random.c:556 cipher/random.c:566
-#, c-format
-msgid "can't write `%s': %s\n"
-msgstr "imposs�vel escrever `%s': %s\n"
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Voc� precisa de uma frase secreta para proteger a sua chave.\n"
+"\n"
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "imposs�vel fechar `%s': %s\n"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muda a frase secreta"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "muda a frase secreta"
 
-#: cipher/random.c:815
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"O gerador de n�meros aleat�rios � apenas um \"remendo\"\n"
-"para poder funcionar - n�o � de modo algum um bom gerador!\n"
-"\n"
-"N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
-"\n"
+"@\n"
+"Op��es:\n"
+" "
 
-#: cipher/rndegd.c:202
-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"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
 msgstr ""
 
-#: cipher/rndlinux.c:132
-#, 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"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
 msgstr ""
-"\n"
-"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/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "detalhado"
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "ser mais silencioso"
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "remo��o do bloco de chave falhou: %s\n"
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "procurar chaves num servidor de chaves"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr ""
+"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "actualizar a base de dados de confian�a"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Por favor comunique bugs para <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "A gera��o de chaves falhou: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "ficheiro de op��es `%s': %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "a ler op��es de `%s'\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "erro ao criar `%s': %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, fuzzy, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: imposs�vel criar directoria: %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "imposs�vel criar %s: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "erro ao enviar para `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "actualiza��o falhou: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "a escrever chave privada para `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: directoria criada\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: imposs�vel criar directoria: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "erro na cria��o da frase secreta: %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: ignorado: %s\n"
+
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "erro na leitura do bloco de chave: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, 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"
+
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: erro ao ler registo livre: %s\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "%s' j� comprimido\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "gerar um novo par de chaves"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Por favor digite a frase secreta \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Por favor digite a frase secreta \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Por favor digite a frase secreta \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "frase secreta incorrecta"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "cancelado pelo utilizador\n"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "chave `%s' n�o encontrada: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "partes da chave secreta n�o dispon�veis\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "armadura: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "remo��o do bloco de chave falhou: %s\n"
+msgid "Yes"
+msgstr "sim"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "A gera��o de chaves falhou: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "assinatura %s de: \"%s\"\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "erro ao criar `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[Utilizador n�o encontrado]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "imposs�vel ligar a `%s': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "problemas na comunica��o com o gpg-agent\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "problema com o agente: o agente returnou 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "cancelado pelo utilizador\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "problema com o agente: o agente returnou 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "imposs�vel desactivar core dumps: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+#, fuzzy
+msgid "yes"
+msgstr "sim"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "sS"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "n�o"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "sair"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: g10/armor.c:320
 #, c-format
@@ -384,176 +813,213 @@ msgstr ""
 "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+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 caracteres imprim�veis ou espa�os, e "
+"terminar com um '='\n"
+
+#: g10/build-packet.c:956
+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/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
+
+#: g10/build-packet.c:980
+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/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "n�o leg�vel por humanos"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -561,207 +1027,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "chave secreta n�o dispon�vel"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "remo��o do bloco de chave falhou: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr ""
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr ""
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Repita a frase secreta: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output n�o funciona para este comando\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output n�o funciona para este comando\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -804,54 +1218,54 @@ msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 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/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "n�o � poss�vel utilizar o pacote ESK sim�trico devido ao modo S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: 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:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -860,168 +1274,202 @@ msgstr ""
 "ao for�ar o algoritmo de compress�o %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, 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:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, 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/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi cifrada com uma chave fraca na cifragem sim�trica.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao tratar pacote cifrado\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, fuzzy, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "%s: imposs�vel criar directoria: %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 #, fuzzy
 msgid "unable to execute external program\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, 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:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, fuzzy, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chave secreta n�o utiliz�vel"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, 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:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "entradas demais no cache pk - desactivado\n"
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[Utilizador n�o encontrado]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, fuzzy, c-format
+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:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %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:2659
+#, 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/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1029,128 +1477,129 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1160,55 +1609,51 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "detalhado"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1216,7 +1661,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1236,15 +1681,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1254,7 +1699,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1262,651 +1707,592 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, 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/gpg.c:1297
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "ficheiro de op��es `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "a ler op��es de `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, 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/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 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/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 #, 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/gpg.c:2988
+#: g10/gpg.c:3012
 #, 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 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/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, 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/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, 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/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "entradas demais no cache pk - desactivado\n"
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[Utilizador n�o encontrado]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, fuzzy, c-format
-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:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %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:2658
-#, 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/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "ser mais silencioso"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 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:102
+#: g10/gpgv.c:100
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1916,7 +2302,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:55
+#: g10/helptext.c:57
 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"
@@ -1929,20 +2315,20 @@ msgstr ""
 "para\n"
 "que esta chave seja de confian�a absoluta.\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1956,7 +2342,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1966,16 +2352,16 @@ msgstr ""
 "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:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Insira o tamanho da chave"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"n�o\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1987,19 +2373,19 @@ msgstr ""
 "reac��o a erros - o sistema tentar� interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 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:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um coment�rio (opcional)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2013,11 +2399,11 @@ msgstr ""
 "O  para continuar a gera��o da chave.\n"
 "S  para interromper a gera��o da chave."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2089,12 +2475,12 @@ msgstr ""
 "\n"
 "Se n�o sabe qual � a resposta correcta, responda \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de utilizador"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2102,11 +2488,11 @@ msgstr ""
 "Responda \"sim\" se quiser realmente remover este ID de utilizador.\n"
 "Todos os certificados tamb�m ser�o perdidos!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2116,7 +2502,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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2128,13 +2514,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:211
+#: g10/helptext.c:213
 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:215
+#: g10/helptext.c:217
 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"
@@ -2147,7 +2533,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:223
+#: g10/helptext.c:225
 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"
@@ -2158,23 +2544,23 @@ msgstr ""
 "O 'timestamp' de todas as auto-assinaturas afectuadas ser� avan�ado\n"
 "em um segundo.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 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:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser escrever por cima do ficheiro"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2183,7 +2569,7 @@ msgstr ""
 "RETURN\n"
 "o ficheiro por omiss�o (que � mostrado entre par�nteses) ser� utilizado."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2212,7 +2598,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:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2222,11 +2608,11 @@ msgstr ""
 "este certificado de revoga��o. Por favor mantenha este texto conciso.\n"
 "Uma linha vazia termina o texto.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
@@ -2261,497 +2647,492 @@ msgstr "chave secreta n�o utiliz�vel"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        n�o importadas: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Assinou estes identificadores de utilizadores:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, fuzzy, c-format
 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:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 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:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, 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:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, 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:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, 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:1233
+#: g10/import.c:1232
 #, 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:1276
+#: g10/import.c:1275
 #, 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:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, 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:1389
+#: g10/import.c:1388
 #, fuzzy, c-format
 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:1391
+#: g10/import.c:1390
 #, fuzzy, c-format
 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:1409
+#: g10/import.c:1408
 #, 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:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, 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:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, 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:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, 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:1788
+#: g10/import.c:1787
 #, 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:1802
+#: g10/import.c:1801
 #, 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:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 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:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 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:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2764,63 +3145,63 @@ msgstr ""
 "(vendo passaportes, verificando impress�es digitais...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Confio moderadamente\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Confio plenamente\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, 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:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2829,11 +3210,11 @@ msgstr ""
 "A sua auto-assinatura em \"%s\"\n"
 "� uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 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:730
+#: g10/keyedit.c:731
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2842,12 +3223,12 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 #, fuzzy
 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) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2856,55 +3237,55 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 #, 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:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "N�o pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto tornaria a chave inutiliz�vel no PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2914,31 +3295,31 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2947,100 +3328,100 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 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:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3048,11 +3429,11 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3060,209 +3441,209 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 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:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, 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:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3270,242 +3651,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 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:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3513,25 +3894,25 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3540,56 +3921,56 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3598,372 +3979,377 @@ 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:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 #, 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:3453
+#: g10/keyedit.c:3454
 #, 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:3459
+#: g10/keyedit.c:3460
 #, 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, 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/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefer�ncia %c%lu duplicada\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, 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:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3979,7 +4365,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3995,40 +4381,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4036,12 +4422,12 @@ 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:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4059,44 +4445,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 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:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4107,7 +4493,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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 "
@@ -4124,23 +4510,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4148,12 +4534,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4165,7 +4551,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4177,50 +4563,50 @@ 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:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, 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:3047
+#: g10/keygen.c:3228
 #, 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:3065
+#: g10/keygen.c:3246
 #, 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:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4229,12 +4615,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:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4242,7 +4628,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4250,31 +4636,31 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr ""
 
@@ -4302,633 +4688,606 @@ msgstr "Nota��o de assinatura: "
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "a verificar o porta chaves `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, 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/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "imposs�vel desactivar core dumps: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrar mais informa��es\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Digite novo nome de ficheiro"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: directoria criada\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, 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:310
-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:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
-
-#: g10/passphrase.c:345
-#, 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/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "imposs�vel ligar a `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema com o agente - a desactivar a utiliza��o deste\n"
@@ -4996,7 +5355,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5005,40 +5364,36 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, 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:146
+#: g10/photoid.c:147
 #, 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:165
+#: g10/photoid.c:166
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
@@ -5324,61 +5679,56 @@ msgstr "nenhum endere�o v�lido\n"
 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:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "erro ao criar `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, 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:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, 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:302
+#: g10/pubkey-enc.c:305
 #, 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:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
@@ -5500,89 +5850,89 @@ msgstr ""
 msgid "Is this okay? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "partes da chave secreta n�o dispon�veis\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, 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:72
+#: g10/seckey-cert.c:74
 #, 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:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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:366
+#: g10/seckey-cert.c:406
 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/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "tentei %d vezes!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, fuzzy, c-format
 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:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 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:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 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:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5590,7 +5940,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5598,55 +5948,55 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, 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:544
+#: g10/sig-check.c:560
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 #, 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
+#: g10/sign.c:94
 #, 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 #, 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:132
+#: g10/sign.c:133
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5654,7 +6004,7 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5673,11 +6023,11 @@ msgstr "verifica��o da assinatura criada falhou: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5685,39 +6035,39 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave n�o est� marcada insegura - imposs�vel us�-la com o RNG falso!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicada\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5775,51 +6125,51 @@ msgstr "armadura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, 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:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de base de dados de confian�a muito grande\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de vers�o: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de dados de confian�a inv�lida criada\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confian�a criada\n"
@@ -5828,78 +6178,78 @@ msgstr "%s: base de dados de confian�a criada\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: n�o � poss�vel escrever na trustdb\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confian�a inv�lida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de vers�o: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de vers�o: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, 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:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 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"
@@ -5910,7 +6260,7 @@ msgstr ""
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
@@ -6082,7 +6432,7 @@ msgstr ""
 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:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6092,345 +6442,1591 @@ 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:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "erro geral"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "voc� encontrou um bug ... (%s:%d)\n"
+
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
+
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "cria��o de armadura falhou: %s\n"
+
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
+
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
+
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Por favor comunique bugs para <[email protected]>.\n"
+
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
+
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "formato de pacote desconhecido"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
+
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
+
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "remo��o do bloco de chave falhou: %s\n"
+
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "erro na leitura do bloco de chave: %s\n"
+
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: erro ao ler registo livre: %s\n"
+
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "%s' j� comprimido\n"
+
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "gerar um novo par de chaves"
+
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "remo��o do bloco de chave falhou: %s\n"
+
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "assinatura %s de: \"%s\"\n"
+
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
+
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
+
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "a ler op��es de `%s'\n"
+
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
+
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
+
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
+
+#: scd/scdaemon.c:126
+#, fuzzy
+msgid "do not use the internal CCID driver"
+msgstr "nunca usar o terminal"
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
+
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "comandos em conflito\n"
+
+#: scd/scdaemon.c:191
+#, fuzzy
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
+
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
+
+#: scd/scdaemon.c:1008
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr ""
+
+#: scd/scdaemon.c:1013
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr ""
+
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "caracter radix64 inv�lido %02x ignorado\n"
+
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
+
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "imposs�vel abrir `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "a escrever chave privada para `%s'\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "NOTA: a chave foi revogada"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "certificado incorrecto"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Nenhuma ajuda dispon�vel"
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "verifica��o da assinatura criada falhou: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "gerar um certificado de revoga��o"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Esta chave expirou!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "mostra impress�o digital"
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "verifica��o da assinatura criada falhou: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "verificar uma assinatura"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
+msgstr "n�o"
+
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
 msgstr "vers�o desconhecida"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "algoritmo de chave p�blica desconhecido"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "algoritmo de \"digest\" desconhecido"
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "chave p�blica incorrecta"
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "chave secreta incorrecta"
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Precisa de uma frase secreta para desbloquear a chave secreta do "
+"utilizador:\n"
+"\n"
+"\"%.*s\"\n"
+"chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "assinatura incorrecta"
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "erro de \"checksum\""
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "frase secreta incorrecta"
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "chave p�blica n�o encontrada"
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "algoritmo de criptografia desconhecido"
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "n�o � poss�vel abrir o porta-chaves"
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "pacote inv�lido"
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "armadura inv�lida"
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "identificador de utilizador inexistente"
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "chave secreta n�o dispon�vel"
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "chave secreta incorrecta"
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "n�o suportado"
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "chave incorrecta"
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "erro de leitura"
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "erro de escrita"
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "algoritmo de compress�o desconhecido"
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "erro na abertura do ficheiro"
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "erro na cria��o do ficheiro"
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "frase-secreta inv�lida"
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algoritmo de chave p�blica n�o implementado"
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "algoritmo de criptografia n�o implementado"
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "prefer�ncia %c%lu duplicada\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "classe de assinatura desconhecida"
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "erro na base de dados de confian�a"
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "resposta do agente inv�lida\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "MPI incorreto"
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "limite de recursos"
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "a escrever para `%s'\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "porta-chaves inv�lido"
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: util/errors.c:88
-msgid "bad certificate"
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "listar as chaves secretas"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "certificado incorrecto"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "remover chaves do porta-chaves p�blico"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "certificado incorrecto"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
 msgstr "certificado incorrecto"
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "identificador de utilizador malformado"
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "erro ao fechar ficheiro"
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "erro na renomea��o do ficheiro"
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "erro na remo��o do ficheiro"
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "muda a frase secreta"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "dados inesperados"
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "criar sa�da com armadura ascii"
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "conflito de \"timestamp\""
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "algoritmo de chave p�blica inutiliz�vel"
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "o ficheiro j� existe"
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "chave fraca"
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "argumento inv�lido"
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "URI incorrecto"
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "URI n�o suportado"
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "erro na rede"
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "n�o cifrado"
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "n�o processado"
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "chave p�blica n�o utiliz�vel"
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "chave secreta n�o utiliz�vel"
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "erro do servidor de chaves"
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "nunca usar o terminal"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "for�ar assinaturas v3"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "sempre usar um MDC para cifrar"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "modo n�o-interactivo: nunca perguntar"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "assumir sim para a maioria das perguntas"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "assumir n�o para a maioria das perguntas"
 
-#: util/errors.c:109
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr ""
+"adicionar este porta-chaves\n"
+"� lista de porta-chaves"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "adicionar este porta-chaves secreto � lista"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOME|usar NOME como chave secreta por omiss�o"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|ENDERE�O|usar este servidor para buscar chaves"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr ""
+"|NOME|definir mapa de caracteres do terminal como\n"
+"NOME"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOME|usar algoritmo de criptografia NOME"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|usar algoritmo de compress�o N"
+
+#: sm/gpgsm.c:520
 #, fuzzy
-msgid "canceled"
-msgstr "cancelado pelo utilizador\n"
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: util/errors.c:110
+#: sm/gpgsm.c:523
 #, fuzzy
-msgid "no card"
-msgstr "n�o cifrado"
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sintaxe: gpg [op��es] [ficheiros]\n"
+"assina, verifica, cifra ou decifra\n"
+"a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: util/errors.c:111
+#: sm/gpgsm.c:617
 #, fuzzy
-msgid "no data"
-msgstr "n�o h� dados assinados\n"
+msgid "usage: gpgsm [options] "
+msgstr "uso: gpg [op��es] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "imposs�vel ligar a `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "a escrever para `%s'\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "imposs�vel fechar `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "N�mero total processado: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "gerar um certificado de revoga��o"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "erro ao criar porta-chaves `%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "porta-chaves `%s' criado\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? problema ao verificar revoga��o: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: util/logger.c:224
+#: sm/qualified.c:224
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... isto � um bug (%s:%d:%s)\n"
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
 
-#: util/logger.c:230
+#: sm/qualified.c:321
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "voc� encontrou um bug ... (%s:%d)\n"
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "verifica��o da assinatura criada falhou: %s\n"
+
+#: sm/verify.c:388
 #, fuzzy
-msgid "yes"
-msgstr "sim"
+msgid "Signature made "
+msgstr "Esta assinatura expirou em %s.\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "sS"
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
-msgstr "n�o"
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Assinatura correcta de \""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                   ou \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "sair"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "qQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "frase secreta demasiado longa\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "assinatura falhou: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "remo��o do bloco de chave falhou: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "erro ao enviar para `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "erro ao enviar para `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "uso: gpg [op��es] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "chave p�blica n�o encontrada"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erro ao criar porta-chaves `%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Comandos:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "decifragem correcta\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "decifragem correcta\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [nome_do_ficheiro]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s n�o � permitido com %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "%s: imposs�vel criar directoria: %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: tools/symcryptrun.c:542
+msgid "no --program option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "imposs�vel criar %s: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "imposs�vel criar %s: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "actualiza��o falhou: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "remo��o do bloco de chave falhou: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "actualiza��o falhou: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "actualiza��o falhou: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "actualiza��o falhou: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "imposs�vel criar `%s': %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "imposs�vel criar `%s': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "nenhum m�dulo de recolha de entropia detectado\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "imposs�vel abrir `%s'\n"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "AVISO: a utilizar mem�ria insegura!\n"
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "a escrever chave privada para `%s'\n"
 
-#: util/secmem.c:98
-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"
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "imposs�vel 'stat' a `%s': %s\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' n�o � um ficheiro normal - ignorado\n"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "nota: random_seed est� vazia\n"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
 #~ msgstr ""
-#~ "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
+#~ "AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "imposs�vel ler `%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "nota: ficheiro random_seed n�o actualizado\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "imposs�vel escrever `%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "imposs�vel fechar `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
 
 #~ 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"
+#~ "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 gerador de n�meros aleat�rios � apenas um \"remendo\"\n"
+#~ "para poder funcionar - n�o � de modo algum um bom gerador!\n"
+#~ "\n"
+#~ "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
+#~ "\n"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "\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 ""
-#~ "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
-#~ "terminar com um '='\n"
+#~ "\n"
+#~ "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"
 
-#~ 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"
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "chave secreta n�o dispon�vel"
+
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Assinou estes identificadores de utilizadores:\n"
+
+#~ msgid "general error"
+#~ msgstr "erro geral"
+
+#~ msgid "unknown packet type"
+#~ msgstr "formato de pacote desconhecido"
+
+#~ msgid "unknown version"
+#~ msgstr "vers�o desconhecida"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "algoritmo de chave p�blica desconhecido"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "algoritmo de \"digest\" desconhecido"
 
-#~ 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"
+#~ msgid "bad public key"
+#~ msgstr "chave p�blica incorrecta"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
+#~ msgid "bad secret key"
+#~ msgstr "chave secreta incorrecta"
 
-#~ msgid "not human readable"
-#~ msgstr "n�o leg�vel por humanos"
+#~ msgid "bad signature"
+#~ msgstr "assinatura incorrecta"
+
+#~ msgid "checksum error"
+#~ msgstr "erro de \"checksum\""
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "algoritmo de criptografia desconhecido"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "n�o � poss�vel abrir o porta-chaves"
+
+#~ msgid "invalid packet"
+#~ msgstr "pacote inv�lido"
+
+#~ msgid "invalid armor"
+#~ msgstr "armadura inv�lida"
+
+#~ msgid "no such user id"
+#~ msgstr "identificador de utilizador inexistente"
+
+#~ msgid "secret key not available"
+#~ msgstr "chave secreta n�o dispon�vel"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "chave secreta incorrecta"
+
+#~ msgid "not supported"
+#~ msgstr "n�o suportado"
+
+#~ msgid "bad key"
+#~ msgstr "chave incorrecta"
+
+#~ msgid "file read error"
+#~ msgstr "erro de leitura"
+
+#~ msgid "file write error"
+#~ msgstr "erro de escrita"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "algoritmo de compress�o desconhecido"
+
+#~ msgid "file open error"
+#~ msgstr "erro na abertura do ficheiro"
+
+#~ msgid "file create error"
+#~ msgstr "erro na cria��o do ficheiro"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "frase-secreta inv�lida"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algoritmo de chave p�blica n�o implementado"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "algoritmo de criptografia n�o implementado"
+
+#~ msgid "unknown signature class"
+#~ msgstr "classe de assinatura desconhecida"
+
+#~ msgid "trust database error"
+#~ msgstr "erro na base de dados de confian�a"
+
+#~ msgid "resource limit"
+#~ msgstr "limite de recursos"
+
+#~ msgid "invalid keyring"
+#~ msgstr "porta-chaves inv�lido"
+
+#~ msgid "malformed user id"
+#~ msgstr "identificador de utilizador malformado"
+
+#~ msgid "file close error"
+#~ msgstr "erro ao fechar ficheiro"
+
+#~ msgid "file rename error"
+#~ msgstr "erro na renomea��o do ficheiro"
+
+#~ msgid "file delete error"
+#~ msgstr "erro na remo��o do ficheiro"
+
+#~ msgid "unexpected data"
+#~ msgstr "dados inesperados"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "conflito de \"timestamp\""
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "algoritmo de chave p�blica inutiliz�vel"
+
+#~ msgid "file exists"
+#~ msgstr "o ficheiro j� existe"
+
+#~ msgid "weak key"
+#~ msgstr "chave fraca"
+
+#~ msgid "invalid argument"
+#~ msgstr "argumento inv�lido"
+
+#~ msgid "bad URI"
+#~ msgstr "URI incorrecto"
+
+#~ msgid "unsupported URI"
+#~ msgstr "URI n�o suportado"
+
+#~ msgid "network error"
+#~ msgstr "erro na rede"
+
+#~ msgid "not encrypted"
+#~ msgstr "n�o cifrado"
+
+#~ msgid "not processed"
+#~ msgstr "n�o processado"
+
+#~ msgid "unusable public key"
+#~ msgstr "chave p�blica n�o utiliz�vel"
+
+#~ msgid "unusable secret key"
+#~ msgstr "chave secreta n�o utiliz�vel"
+
+#~ msgid "keyserver error"
+#~ msgstr "erro do servidor de chaves"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "n�o cifrado"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "n�o h� dados assinados\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... isto � um bug (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "AVISO: a utilizar mem�ria insegura!\n"
+
+#~ 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"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
+
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6469,10 +8065,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
 #, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "erro na cria��o da frase secreta: %s\n"
-
-#, fuzzy
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "algoritmo de criptografia desconhecido"
 
@@ -6485,18 +8077,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ 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"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "problemas na comunica��o com o gpg-agent\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "frase secreta demasiado longa\n"
-
-#~ msgid "invalid response from agent\n"
-#~ msgstr "resposta do agente inv�lida\n"
-
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "problema com o agente: o agente returnou 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "seleciona chave secund�ria N"
 
@@ -6740,20 +8320,9 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ "algoritmo mais standard!x\n"
 
 #, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "a escrever para `%s'\n"
-
-#, fuzzy
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "chave `%s' n�o encontrada: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "imposs�vel criar `%s': %s\n"
-
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "imposs�vel abrir %s: %s\n"
@@ -6799,9 +8368,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: AVISO: ficheiro vazio\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "imposs�vel abrir %s: %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
 #~ msgstr " %d = Confio moderadamente\n"
@@ -6838,9 +8404,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: imposs�vel criar: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: imposs�vel criar directoria: %s\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr ""
 #~ "Se voc� quiser usar esta chave revogada assim mesmo, responda \"sim\"."
@@ -6850,10 +8413,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
 #, fuzzy
-#~ msgid "can't open file: %s\n"
-#~ msgstr "imposs�vel abrir %s: %s\n"
-
-#, fuzzy
 #~ msgid "error: no ownertrust value\n"
 #~ msgstr "exportar os valores de confian�a"
 
@@ -6866,9 +8425,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- revoga��o falsa encontrada\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? problema ao verificar revoga��o: %s\n"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr "[expira: %s]"
@@ -6880,9 +8436,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "revkey"
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "imposs�vel criar %s: %s\n"
-
 #~ msgid "|[files]|encrypt files"
 #~ msgstr "|[ficheiros]|cifrar ficheiros"
 
@@ -6916,18 +8469,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ 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"
 
@@ -6937,52 +8478,18 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ 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 "|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 "|[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"
 
@@ -7009,15 +8516,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ "|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"
 
@@ -7068,9 +8566,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "can't get key from keyserver: %s\n"
 #~ msgstr "n�o consigo obter chave do servidor: %s\n"
 
-#~ msgid "error sending to `%s': %s\n"
-#~ msgstr "erro ao enviar para `%s': %s\n"
-
 #~ msgid "success sending to `%s' (status=%u)\n"
 #~ msgstr "sucesso ao enviar para `%s' (estado=%u)\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 51c733730..80750453e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -21,296 +21,720 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr ""
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
 msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Por favor digite a frase secreta"
+
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "linha muito longa\n"
+
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "linha muito longa\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Caractere inv�lido no nome\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
 msgstr ""
 
-#: cipher/random.c:403
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "MPI incorreto"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "frase secreta incorreta"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "frase secreta incorreta"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "imposs�vel abrir `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: cipher/random.c:408
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "escrevendo certificado privado para `%s'\n"
+msgid "can't create `%s': %s\n"
+msgstr "imposs�vel criar %s: %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:458
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
 #, fuzzy, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "imposs�vel abrir `%s': %s\n"
+msgid "error getting serial number of card: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr ""
-
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
+msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: cipher/random.c:474
-#, fuzzy
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: cipher/random.c:482
+#: agent/command-ssh.c:1648
 #, fuzzy, c-format
-msgid "can't read `%s': %s\n"
-msgstr "imposs�vel abrir `%s': %s\n"
+msgid "no suitable card key found: %s\n"
+msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr ""
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: agent/command-ssh.c:1713
 #, fuzzy, c-format
-msgid "can't create `%s': %s\n"
-msgstr "imposs�vel criar %s: %s\n"
+msgid "error writing key: %s\n"
+msgstr "erro na escrita do chaveiro `%': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2018
 #, fuzzy, c-format
-msgid "can't write `%s': %s\n"
-msgstr "imposs�vel abrir `%s': %s\n"
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Por favor digite a frase secreta"
+
+#: agent/command-ssh.c:2353
+#, c-format
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
+#: agent/command-ssh.c:2857
 #, fuzzy, c-format
-msgid "can't close `%s': %s\n"
-msgstr "imposs�vel abrir `%s': %s\n"
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "Digite o identificador de usu�rio: "
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Repita a frase secreta: "
+
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
+
+#: agent/divert-scd.c:290
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
-"O gerador de n�meros aleat�rios � apenas um \"remendo\"\n"
-"para poder funcionar - n�o � de modo algum um bom gerador!\n"
-"\n"
-"N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: cipher/rndegd.c:202
-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"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muda a frase secreta"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 msgstr ""
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "muda a frase secreta"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"\n"
-"N�o h� bytes aleat�rios suficientes. Por favor, fa�a algum outro trabalho\n"
-"para que o sistema possa coletar mais entropia!\n"
-"(S�o necess�rios mais %d bytes)\n"
+"@\n"
+"Op��es:\n"
+" "
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "enumera��o de blocos de chaves falhou: %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "detalhado"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "ser mais silencioso"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "exportar chaves para um servidor"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "atualizar o banco de dados de confiabilidade"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Por favor comunique bugs para <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN callback returned error: %s\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:303
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core while allocating %lu bytes"
+msgstr ""
+
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
+
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "arquivo de op��es `%s': %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "lendo op��es de `%s'\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "A gera��o de chaves falhou: %s\n"
+msgid "error creating `%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, fuzzy, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: imposs�vel criar diret�rio: %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "imposs�vel criar %s: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "atualiza��o falhou: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "escrevendo certificado privado para `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: diret�rio criado\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: imposs�vel criar diret�rio: %s\n"
+
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1446
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, fuzzy, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "atualiza��o da chave secreta falhou: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "\t%lu chaves ignoradas\n"
+
+#: agent/gpg-agent.c:1650
+msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "erro na cria��o da frase secreta: %s\n"
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "erro na leitura de `%s': %s\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: erro lendo registro livre: %s\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
+
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "key already exists\n"
-msgstr "%lu chaves processadas\n"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Por favor digite a frase secreta"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Por favor digite a frase secreta"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1217
 #, fuzzy
-msgid "generating new key\n"
-msgstr "gerar um novo par de chaves"
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Por favor digite a frase secreta"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "frase secreta incorreta"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+msgid "cancelled\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "usu�rio `%s' n�o encontrado: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "chave secreta n�o dispon�vel"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "erro de leitura: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "enumera��o de blocos de chaves falhou: %s\n"
+msgid "Yes"
+msgstr "sim"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "A gera��o de chaves falhou: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr ""
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:382 common/exechelp.c:540
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "assinatura %s de: %s\n"
+msgid "error forking process: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:446
+#, fuzzy, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: common/exechelp.c:487
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "%s: usu�rio n�o encontrado\n"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
+msgid "can't connect to `%s': %s\n"
+msgstr "imposs�vel abrir `%s': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr ""
+
+#: common/simple-pwquery.c:389
+msgid "problem setting the gpg-agent options\n"
+msgstr ""
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+msgid "canceled by user\n"
+msgstr ""
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+msgid "problem with the agent\n"
+msgstr ""
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "imposs�vel desativar core dumps: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "%s: novo arquivo de op��es criado\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "%s: novo arquivo de op��es criado\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+#, fuzzy
+msgid "yes"
+msgstr "sim"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "sS"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "n�o"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+# INICIO MENU
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "sair"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr ""
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr ""
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: g10/armor.c:320
 #, c-format
@@ -389,177 +813,216 @@ msgstr ""
 "caractere \"quoted printable\" na armadura  - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+#, fuzzy
+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"
+
+#: g10/build-packet.c:956
+#, 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/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
+
+#: g10/build-packet.c:980
+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/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr ""
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado(s)"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -567,211 +1030,156 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "chave secreta n�o dispon�vel"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "enumera��o de blocos de chaves falhou: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-#, fuzzy
-msgid "Enter New Admin PIN: "
-msgstr "Digite o identificador de usu�rio: "
-
-#: g10/cardglue.c:918
-#, fuzzy
-msgid "Enter New PIN: "
-msgstr "Digite o identificador de usu�rio: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/cardglue.c:920
-#, fuzzy
-msgid "Enter PIN: "
-msgstr "Digite o identificador de usu�rio: "
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Repita a frase secreta: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
-
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr ""
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -815,219 +1223,253 @@ msgstr "h� uma chave secreta para esta chave p�blica!\n"
 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/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: 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:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
 "sim�trica.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "eliminar o campo keyid dos pacotes criptografados\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, fuzzy, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "%s: imposs�vel criar diret�rio: %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chave secreta incorreta"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "entradas demais no cache pk - desativado\n"
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[usu�rio n�o encontrado]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %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:2659
+#, 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/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1035,134 +1477,135 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1172,61 +1615,57 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "detalhado"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1246,15 +1685,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1264,7 +1703,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1272,653 +1711,594 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "arquivo de op��es `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "lendo op��es de `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 #, 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/gpg.c:2988
+#: g10/gpg.c:3012
 #, 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, 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/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "entradas demais no cache pk - desativado\n"
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[usu�rio n�o encontrado]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr ""
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %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:2658
-#, 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/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "ser mais silencioso"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 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:102
+#: g10/gpgv.c:100
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 #, fuzzy
 msgid ""
 "Syntax: gpg [options] [files]\n"
@@ -1927,7 +2307,7 @@ msgstr ""
 "Sintaxe: gpgm [op��es] [arquivos]\n"
 "Utilit�rio de manuten��o do GnuPG\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1937,7 +2317,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:55
+#: g10/helptext.c:57
 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"
@@ -1945,19 +2325,19 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1971,23 +2351,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Digite o tamanho da chave"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"n�o\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1999,19 +2379,19 @@ msgstr ""
 "rea��o a erros - o sistema tentar� interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 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:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um coment�rio (opcional)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2025,11 +2405,11 @@ msgstr ""
 "O  para continuar a gera��o da chave.\n"
 "S  para interromper a gera��o da chave."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2070,12 +2450,12 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de usu�rio"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2083,11 +2463,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:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2097,7 +2477,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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2109,13 +2489,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:211
+#: g10/helptext.c:213
 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:215
+#: g10/helptext.c:217
 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"
@@ -2128,33 +2508,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:223
+#: g10/helptext.c:225
 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:230
+#: g10/helptext.c:232
 #, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 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:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser sobrescrever o arquivo"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2162,7 +2542,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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2178,18 +2558,18 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 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:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
@@ -2225,493 +2605,488 @@ msgstr "chave secreta incorreta"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importados: %lu"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Voc� assinou estes IDs de usu�rio:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, fuzzy, c-format
 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:770
+#: g10/import.c:769
 #, 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:772
+#: g10/import.c:771
 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:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, 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:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, 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:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, 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:1233
+#: g10/import.c:1232
 #, 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:1276
+#: g10/import.c:1275
 #, 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:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, 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:1389
+#: g10/import.c:1388
 #, fuzzy, c-format
 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:1391
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, 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:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, 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:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, 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:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 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:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, 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:1788
+#: g10/import.c:1787
 #, 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:1802
+#: g10/import.c:1801
 #, 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:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, fuzzy, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 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:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 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:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2730,172 +3105,172 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informa��es\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 #, 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:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 #, 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:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 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:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2904,90 +3279,90 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2995,12 +3370,12 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3008,208 +3383,208 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3217,700 +3592,705 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 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:1818
+#: g10/keyedit.c:1819
 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:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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:3011
+#: g10/keyedit.c:3012
 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 #, 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:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 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:3352
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3373
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 #, 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:3453
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3460
 #, 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:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 #, 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:4639
+#: g10/keyedit.c:4640
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
 # muitas ou demais ???
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "Prefer�ncias demais"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "criptografar dados"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3926,7 +4306,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -3943,40 +4323,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3984,12 +4364,12 @@ 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:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4006,44 +4386,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 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:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4054,7 +4434,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4069,24 +4449,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 #, 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4094,12 +4474,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4111,7 +4491,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4123,50 +4503,50 @@ 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:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, 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:3047
+#: g10/keygen.c:3228
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4175,12 +4555,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:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4188,7 +4568,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4196,31 +4576,31 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr ""
 
@@ -4252,635 +4632,608 @@ msgstr "Nota��o: "
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "imposs�vel desativar core dumps: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Digite novo nome de arquivo"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: diret�rio criado\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, 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:310
-msgid "gpg-agent is not available in this session\n"
-msgstr ""
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr ""
-
-#: g10/passphrase.c:345
-#, fuzzy, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "algoritmo de prote��o %d n�o � suportado\n"
-
-#: g10/passphrase.c:362
-#, fuzzy, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "imposs�vel abrir `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
@@ -4949,7 +5302,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4958,40 +5311,36 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, 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:146
+#: g10/photoid.c:147
 #, 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:165
+#: g10/photoid.c:166
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "imposs�vel abrir %s: %s\n"
@@ -5280,62 +5629,57 @@ msgstr "nenhum endere�o v�lido\n"
 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:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, fuzzy, c-format
-msgid "error creating `%s': %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinat�rio an�nimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, 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:302
+#: g10/pubkey-enc.c:305
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
@@ -5456,90 +5800,90 @@ msgstr ""
 msgid "Is this okay? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, 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:72
+#: g10/seckey-cert.c:74
 #, 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:266
+#: g10/seckey-cert.c:293
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "%d tentativas!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 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:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 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:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5547,7 +5891,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5555,54 +5899,54 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, fuzzy, c-format
 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/sig-check.c:544
+#: g10/sig-check.c:560
 #, 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:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:132
+#: g10/sign.c:133
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5619,51 +5963,51 @@ msgstr "leitura de registro de assinatura falhou: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: 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:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1278
+#: g10/sign.c:1285
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave n�o est� marcada como insegura - imposs�vel us�-la com o pseudo "
 "RNG!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5723,51 +6067,51 @@ msgstr "erro de leitura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, 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:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de banco de dados de confiabilidade muito grande\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registro de vers�o: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido criado\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade criado\n"
@@ -5776,78 +6120,78 @@ msgstr "%s: banco de dados de confiabilidade criado\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, 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:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
@@ -5858,7 +6202,7 @@ msgstr ""
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
@@ -6029,7 +6373,7 @@ msgstr ""
 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:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6039,341 +6383,1599 @@ 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:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "erro geral"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "formato de pacote desconhecido"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "vers�o desconhecida"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "algoritmo de chave p�blica desconhecido"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "cria��o de armadura falhou: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "algoritmo de \"digest\" desconhecido"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr "definir par�metros de depura��o"
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "chave p�blica incorreta"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr "habilitar depura��o completa"
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "chave secreta incorreta"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "assinatura incorreta"
+#: kbx/kbxutil.c:108
+msgid ".\n"
+msgstr ""
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "erro de \"checksum\""
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "frase secreta incorreta"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "chave p�blica n�o encontrada"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "algoritmo de criptografia desconhecido"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "n�o � poss�vel abrir o chaveiro"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "pacote inv�lido"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "armadura inv�lida"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "identificador de usu�rio inexistente"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "chave secreta n�o dispon�vel"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "chave secreta incorreta"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-# suportado ???
-#: util/errors.c:73
-msgid "not supported"
-msgstr "n�o suportado"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "chave incorreta"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "erro de leitura"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "erro de escrita"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "algoritmo de compress�o desconhecido"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "erro na abertura de arquivo"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "erro na cria��o de arquivo"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "frase secreta inv�lida"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algoritmo de chave p�blica n�o implementado"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "algoritmo de criptografia n�o implementado"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "classe de assinatura desconhecida"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "erro na leitura de `%s': %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "erro no banco de dados de confiabilidade"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: erro lendo registro livre: %s\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "MPI incorreto"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "%lu chaves processadas\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "limite de recurso"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "chaveiro inv�lido"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "gerar um novo par de chaves"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "certificado incorreto"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "identificador de usu�rio malformado"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "erro no fechamento de arquivo"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "erro na renomea��o de arquivo"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "erro na remo��o de arquivo"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "dados inesperados"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "conflito de \"timestamp\""
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "algoritmo de chave p�blica inutiliz�vel"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "A gera��o de chaves falhou: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "o arquivo j� existe"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "chave fraca"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "assinatura %s de: %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "argumento inv�lido"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "URI incorreto"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "URI n�o suportado"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "erro na rede"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "n�o criptografado"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "n�o processado(s)"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "lendo op��es de `%s'\n"
 
-#: util/errors.c:106
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
+
+#: scd/scdaemon.c:122
 #, fuzzy
-msgid "unusable public key"
-msgstr "chave p�blica incorreta"
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: util/errors.c:107
+#: scd/scdaemon.c:123
 #, fuzzy
-msgid "unusable secret key"
-msgstr "chave secreta incorreta"
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: util/errors.c:108
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "keyserver error"
-msgstr "erro geral"
+msgid "do not use the internal CCID driver"
+msgstr "nunca usar o terminal"
 
-#: util/errors.c:109
-msgid "canceled"
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
 msgstr ""
 
-#: util/errors.c:110
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "n�o criptografado"
+msgid "allow the use of admin card commands"
+msgstr "comandos conflitantes\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "no dados assinados\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... isto � um bug (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "voc� encontrou um bug ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "caractere radix64 inv�lido %02x ignorado\n"
+
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
+
+#: sm/call-dirmngr.c:216
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr ""
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "algoritmo de prote��o %d n�o � suportado\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "algoritmo de prote��o %d n�o � suportado\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "imposs�vel abrir `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
 #, fuzzy
-msgid "yes"
-msgstr "sim"
+msgid "certificate policy not allowed"
+msgstr "escrevendo certificado privado para `%s'\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "sS"
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "chave %08lX: a chave foi revogada!\n"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "Certificado correto"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Nenhuma ajuda dispon�vel"
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "leitura de registro de assinatura falhou: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "Certificado correto"
+
+#: sm/certchain.c:713
+#, fuzzy, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "erro de leitura do certificado: %s\n"
+
+#: sm/certchain.c:729
+#, fuzzy
+msgid "certificate not yet valid"
+msgstr "Certificado de revoga��o v�lido"
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "erro de leitura do certificado: %s\n"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+#, fuzzy
+msgid "root certificate is not marked trusted"
+msgstr ""
+"Nenhum certificado com confian�a indefinida encontrado.\n"
+"\n"
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "Impress�o digital:"
+
+#: sm/certchain.c:860
+#, fuzzy
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+"Nenhum certificado com confian�a indefinida encontrado.\n"
+"\n"
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "leitura de registro de assinatura falhou: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+#, fuzzy
+msgid "certificate chain too long\n"
+msgstr "Certificado de revoga��o v�lido"
+
+#: sm/certchain.c:913
+#, fuzzy
+msgid "issuer certificate not found"
+msgstr "Certificado de revoga��o v�lido"
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "verificar uma assinatura"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "n�o"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "vers�o desconhecida"
+
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "erro: impress�o digital inv�lida\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "erro: impress�o digital inv�lida\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"\n"
+"Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
+"usu�rio: \"%.*s\"\n"
+"%u-bit %s chave, ID %08lX, criada %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+# "hash" poderia ser "espalhamento", mas n�o fica claro
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "algoritmo de hash inv�lido `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Endere�o eletr�nico inv�lido\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "usu�rio `%s' n�o encontrado: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "certificado duplicado - removido"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "certificado duplicado - removido"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "nenhum endere�o v�lido\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "erro na escrita do chaveiro `%': %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[arquivo]|fazer uma assinatura"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[arquivo]|fazer uma assinatura em texto puro"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "listar as chaves secretas"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "Certificado de revoga��o v�lido"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "remover a chave do chaveiro p�blico"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "Certificado correto"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "Certificado correto"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "muda a frase secreta"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "criar sa�da com armadura ascii"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NOME|usar NOME como destinat�rio padr�o"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "usar a chave padr�o como destinat�rio padr�o"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "nunca usar o terminal"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "for�ar assinaturas v3"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "sempre usar um MDC para criptografar"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "modo n�o-interativo: nunca perguntar"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "assumir sim para a maioria das perguntas"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "assumir n�o para a maioria das perguntas"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "adicionar este chaveiro � lista de chaveiros"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "adicionar este chaveiro secreto � lista"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOME|usar NOME como chave secreta padr�o"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|ENDERE�O|usar este servidor para buscar chaves"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr ""
+"|NOME|definir mapa de caracteres do terminal como\n"
+"NOME"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOME|usar algoritmo de criptografia NOME"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|usar algoritmo de compress�o N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sintaxe: gpg [op��es] [arquivos]\n"
+"assina, verifica, criptografa ou descriptografa\n"
+"a opera��o padr�o depende dos dados de entrada\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "Uso: gpgm [op��es] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "imposs�vel abrir `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "escrevendo para `%s'\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "imposs�vel abrir `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "N�mero total processado: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "Certificado correto"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "%s: chaveiro criado\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: sm/keydb.c:1392
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "erro: impress�o digital inv�lida\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "leitura de registro de assinatura falhou: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Esta chave n�o � protegida.\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Assinatura correta de \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                   ou \""
 
 # INICIO MENU
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "sair"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "qQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "linha muito longa\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "destinat�rio padr�o desconhecido `%s'\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "assinatura falhou: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+#, fuzzy
+msgid "Options useful for debugging"
+msgstr "habilitar depura��o completa"
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "uso: gpg [op��es] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "chave p�blica n�o encontrada"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Comandos:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "descriptografia correta\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "descriptografia correta\n"
 
-#: util/secmem.c:97
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [nome_do_arquivo]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
 #, fuzzy
-msgid "WARNING: using insecure memory!\n"
-msgstr "Aviso: usando mem�ria insegura!\n"
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s n�o � permitido com %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "%s: imposs�vel criar diret�rio: %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: tools/symcryptrun.c:542
+msgid "no --program option provided\n"
+msgstr ""
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "imposs�vel criar %s: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "imposs�vel criar %s: %s\n"
+
+#: tools/symcryptrun.c:606
+#, fuzzy, c-format
+msgid "could not fork: %s\n"
+msgstr "%s: usu�rio n�o encontrado: %s\n"
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "atualiza��o falhou: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "atualiza��o falhou: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "atualiza��o falhou: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "atualiza��o falhou: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "imposs�vel criar %s: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "imposs�vel criar %s: %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "algoritmo de prote��o %d n�o � suportado\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "imposs�vel abrir `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "escrevendo certificado privado para `%s'\n"
+
+#, fuzzy
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "imposs�vel abrir `%s': %s\n"
+
+#, fuzzy
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
+
+#, fuzzy
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "imposs�vel abrir `%s': %s\n"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
+#, fuzzy
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "imposs�vel abrir `%s': %s\n"
 
 #, fuzzy
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "imposs�vel abrir `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
+
+#~ 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 gerador de n�meros aleat�rios � apenas um \"remendo\"\n"
+#~ "para poder funcionar - n�o � de modo algum um bom gerador!\n"
+#~ "\n"
+#~ "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
+#~ "\n"
+
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "\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 ""
-#~ "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados "
-#~ "e terminar com '='\n"
+#~ "\n"
+#~ "N�o h� bytes aleat�rios suficientes. Por favor, fa�a algum outro "
+#~ "trabalho\n"
+#~ "para que o sistema possa coletar mais entropia!\n"
+#~ "(S�o necess�rios mais %d bytes)\n"
 
 #, 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"
+#~ msgid "card reader not available\n"
+#~ msgstr "chave secreta n�o dispon�vel"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
+#~ msgid "Enter New PIN: "
+#~ msgstr "Digite o identificador de usu�rio: "
 
-#~ 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"
+#, fuzzy
+#~ msgid "Enter PIN: "
+#~ msgstr "Digite o identificador de usu�rio: "
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Voc� assinou estes IDs de usu�rio:\n"
+
+#~ msgid "general error"
+#~ msgstr "erro geral"
+
+#~ msgid "unknown packet type"
+#~ msgstr "formato de pacote desconhecido"
+
+#~ msgid "unknown version"
+#~ msgstr "vers�o desconhecida"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "algoritmo de chave p�blica desconhecido"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "algoritmo de \"digest\" desconhecido"
+
+#~ msgid "bad public key"
+#~ msgstr "chave p�blica incorreta"
+
+#~ msgid "bad secret key"
+#~ msgstr "chave secreta incorreta"
+
+#~ msgid "bad signature"
+#~ msgstr "assinatura incorreta"
+
+#~ msgid "checksum error"
+#~ msgstr "erro de \"checksum\""
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "algoritmo de criptografia desconhecido"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "n�o � poss�vel abrir o chaveiro"
+
+#~ msgid "invalid packet"
+#~ msgstr "pacote inv�lido"
+
+#~ msgid "invalid armor"
+#~ msgstr "armadura inv�lida"
+
+#~ msgid "no such user id"
+#~ msgstr "identificador de usu�rio inexistente"
+
+#~ msgid "secret key not available"
+#~ msgstr "chave secreta n�o dispon�vel"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "chave secreta incorreta"
+
+# suportado ???
+#~ msgid "not supported"
+#~ msgstr "n�o suportado"
+
+#~ msgid "bad key"
+#~ msgstr "chave incorreta"
+
+#~ msgid "file read error"
+#~ msgstr "erro de leitura"
+
+#~ msgid "file write error"
+#~ msgstr "erro de escrita"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "algoritmo de compress�o desconhecido"
+
+#~ msgid "file open error"
+#~ msgstr "erro na abertura de arquivo"
+
+#~ msgid "file create error"
+#~ msgstr "erro na cria��o de arquivo"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "frase secreta inv�lida"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algoritmo de chave p�blica n�o implementado"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "algoritmo de criptografia n�o implementado"
+
+#~ msgid "unknown signature class"
+#~ msgstr "classe de assinatura desconhecida"
+
+#~ msgid "trust database error"
+#~ msgstr "erro no banco de dados de confiabilidade"
+
+#~ msgid "resource limit"
+#~ msgstr "limite de recurso"
+
+#~ msgid "invalid keyring"
+#~ msgstr "chaveiro inv�lido"
+
+#~ msgid "bad certificate"
+#~ msgstr "certificado incorreto"
+
+#~ msgid "malformed user id"
+#~ msgstr "identificador de usu�rio malformado"
+
+#~ msgid "file close error"
+#~ msgstr "erro no fechamento de arquivo"
+
+#~ msgid "file rename error"
+#~ msgstr "erro na renomea��o de arquivo"
+
+#~ msgid "file delete error"
+#~ msgstr "erro na remo��o de arquivo"
+
+#~ msgid "unexpected data"
+#~ msgstr "dados inesperados"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "conflito de \"timestamp\""
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "algoritmo de chave p�blica inutiliz�vel"
+
+#~ msgid "file exists"
+#~ msgstr "o arquivo j� existe"
+
+#~ msgid "weak key"
+#~ msgstr "chave fraca"
+
+#~ msgid "invalid argument"
+#~ msgstr "argumento inv�lido"
+
+#~ msgid "bad URI"
+#~ msgstr "URI incorreto"
+
+#~ msgid "unsupported URI"
+#~ msgstr "URI n�o suportado"
+
+#~ msgid "network error"
+#~ msgstr "erro na rede"
+
+#~ msgid "not encrypted"
+#~ msgstr "n�o criptografado"
+
+#~ msgid "not processed"
+#~ msgstr "n�o processado(s)"
+
+#, fuzzy
+#~ msgid "unusable public key"
+#~ msgstr "chave p�blica incorreta"
+
+#, fuzzy
+#~ msgid "unusable secret key"
+#~ msgstr "chave secreta incorreta"
+
+#, fuzzy
+#~ msgid "keyserver error"
+#~ msgstr "erro geral"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "n�o criptografado"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "no dados assinados\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... isto � um bug (%s:%d:%s)\n"
+
+#, fuzzy
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "Aviso: usando mem�ria insegura!\n"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6412,17 +8014,9 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgstr "Nenhum identificador de usu�rio para chave\n"
 
 #, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "erro na cria��o da frase secreta: %s\n"
-
-#, fuzzy
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "algoritmo de criptografia desconhecido"
 
-#, fuzzy
-#~ msgid "passphrase too long\n"
-#~ msgstr "linha muito longa\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "seleciona chave secund�ria N"
 
@@ -6669,22 +8263,10 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ "algoritmo padr�o!\n"
 
 #, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "escrevendo para `%s'\n"
-
-#, fuzzy
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
 #, fuzzy
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "usu�rio `%s' n�o encontrado: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "imposs�vel criar %s: %s\n"
-
-#, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "imposs�vel abrir arquivo: %s\n"
 
@@ -6730,9 +8312,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: AVISO: arquivo vazio\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "imposs�vel abrir %s: %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust fully\n"
 #~ msgstr "%s: n�o � um banco de dados de confiabilidade\n"
@@ -6769,9 +8348,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: imposs�vel criar: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: imposs�vel criar diret�rio: %s\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr ""
 #~ "Se voc� quiser usar esta chave revogada assim mesmo, responda \"sim\"."
@@ -6780,9 +8356,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "imposs�vel abrir %s: %s\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "imposs�vel abrir arquivo: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "erro: falta dois pontos\n"
 
@@ -6812,9 +8385,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "revkey"
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "imposs�vel criar %s: %s\n"
-
 #~ msgid "store only"
 #~ msgstr "apenas armazenar"
 
@@ -6844,18 +8414,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ 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"
@@ -6868,48 +8426,16 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ 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"
-
 #, 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"
 
@@ -6939,15 +8465,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ "|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"
@@ -6982,10 +8499,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\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"
@@ -7183,13 +8696,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgstr "Nenhuma rota encontrada que leve a uma de nossas chaves.\n"
 
 #~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Nenhum certificado com confian�a indefinida encontrado.\n"
-#~ "\n"
-
-#~ msgid ""
 #~ "No trust values changed.\n"
 #~ "\n"
 #~ msgstr ""
@@ -7260,12 +8766,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "Invalid user ID revocation"
 #~ msgstr "Revoga��o de ID de usu�rio inv�lida"
 
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Certificado de revoga��o v�lido"
-
-#~ msgid "Good certificate"
-#~ msgstr "Certificado correto"
-
 #~ msgid "Invalid certificate revocation"
 #~ msgstr "Certificado de revoga��o inv�lido"
 
@@ -7275,9 +8775,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "registro de assinatura %lu[%d] aponta para registro errado.\n"
 
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "certificado duplicado - removido"
-
 #~ msgid "tdbio_search_dir failed: %s\n"
 #~ msgstr "tdbio_search_dir falhou: %s\n"
 
@@ -7299,9 +8796,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "\t%lu due to new pubkeys\n"
 #~ msgstr "\t%lu devido a novas chaves p�blicas\n"
 
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu chaves ignoradas\n"
-
 #~ msgid "\t%lu keys updated\n"
 #~ msgstr "\t%lu chaves atualizadas\n"
 
@@ -7350,21 +8844,12 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgstr ""
 #~ "Voc� realmente quer criar uma chave para assinatura e criptografia? "
 
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: usu�rio n�o encontrado: %s\n"
-
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "erro de leitura do certificado: %s\n"
-
 #~ msgid "no default public keyring\n"
 #~ msgstr "sem chaveiro p�blico padr�o\n"
 
 #~ msgid "can't lock keyring `%s': %s\n"
 #~ msgstr "imposs�vel bloquear chaveiro `%s': %s\n"
 
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: usu�rio n�o encontrado\n"
-
 #~ msgid "WARNING: can't yet handle long pref records\n"
 #~ msgstr ""
 #~ "AVISO: ainda � imposs�vel manipular registros de prefer�ncias longos\n"
@@ -7385,12 +8870,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ "Chaves RSA n�o s�o recomend�veis; por favor considere criar uma nova "
 #~ "chave e us�-la no futuro\n"
 
-#~ msgid "set debugging flags"
-#~ msgstr "definir par�metros de depura��o"
-
-#~ msgid "enable full debugging"
-#~ msgstr "habilitar depura��o completa"
-
 #~ msgid "do not write comment packets"
 #~ msgstr "n�o escrever pacotes de coment�rio"
 
@@ -7484,9 +8963,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "can't lock keyring `%': %s\n"
 #~ msgstr "imposs�vel bloquear chaveiro `%': %s\n"
 
-#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "erro na escrita do chaveiro `%': %s\n"
-
 #~ msgid "writing keyblock\n"
 #~ msgstr "escrevendo bloco de chaves\n"
 
@@ -7501,12 +8977,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgid "Can't check MDC: %s\n"
 #~ msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#~ msgid "Usage: gpgm [options] [files] (-h for help)"
-#~ msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
-
-#~ msgid "usage: gpgm [options] "
-#~ msgstr "Uso: gpgm [op��es] "
-
 #, fuzzy
 #~ msgid "chained sigrec %lu has a wrong owner\n"
 #~ msgstr "sigrec em cadeia %lu possui dono errado\n"
diff --git a/po/ro.po b/po/ro.po
index 2287656e0..a6dce33c3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -18,297 +18,726 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "nu pot genera un num�r prim cu  pbi�i=%u qbi�i=%u\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr ""
+"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "nu pot �ncuia (lock) `%s'\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "linie prea lung�"
+
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "fraz�-parol� prea lung�\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Caracter invalid �n nume\n"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "MPI incorect"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "fraz�-parol� incorect�"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "fraz�-parol� incorect�"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "scriu cheia secret� �n `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "algoritm rezumat %d nu este suportat\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "nu pot crea `%s': %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "nu pot ob�ine statistici `%s': %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' nu este un fi�ier normal - ignorat\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
+
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
+
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "not�: fi�ier random_seed este gol\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "eroare la scrierea inelului de chei `%s': %s\n"
+
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr ""
-"AVERTISMENT: dimensiune invalid� pentru fi�ierul random_seed - nu va fi "
-"folosit�\n"
+"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: cipher/random.c:482
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't read `%s': %s\n"
-msgstr "nu pot citi `%s': %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: am e�uat s� creez hashtable: %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "nu pot crea `%s': %s\n"
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "|A|PIN Admin"
 
-#: cipher/random.c:556 cipher/random.c:566
-#, c-format
-msgid "can't write `%s': %s\n"
-msgstr "nu pot scrie `%s': %s\n"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Repeta�i acest PIN: "
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "nu pot �nchide `%s': %s\n"
+#: agent/divert-scd.c:278
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
+
+#: agent/divert-scd.c:290
+#, fuzzy, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
+"\n"
+
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "schimb� fraza-parol�"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 msgstr ""
-"AVERISMENT: este folosit un generator de numere aleatoare nesigur "
-"(insecure)!!\n"
 
-#: cipher/random.c:815
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "schimb� fraza-parol�"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\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"
+"@\n"
+"Op�iuni:\n"
+" "
+
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
+
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "locvace"
 
-#: cipher/rndegd.c:202
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "fii oarecum mai t�cut"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "caut� pentru chei pe un server de chei"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "actualizeaz� baza de date de �ncredere"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "eroare la crearea frazei-parol�: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "Raporta�i bug-uri la <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\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/rndlinux.c:132
+#: agent/gpg-agent.c:300
 #, 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"
+msgid "out of core in secure memory while allocating %lu bytes"
 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"
 
-#: g10/app-openpgp.c:596
+#: agent/gpg-agent.c:303
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "am e�uat s� stochez amprenta: %s\n"
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:609
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
 #, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "am e�uat s� stochez data cre�rii: %s\n"
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
 
-#: g10/app-openpgp.c:977
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
 #, c-format
-msgid "reading public key failed: %s\n"
-msgstr "citirea cheii publice a e�uat: %s\n"
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
-msgstr "r�spunsul nu con�ine datele cheii publice\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
-msgstr "r�spunsul nu con�ine modulul RSA\n"
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
-msgstr "r�spunsul nu con�ine exponentul public RSA\n"
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "apelul PIN a returnat eroare: %s\n"
+msgid "error creating `%s': %s\n"
+msgstr "eroare la creearea `%s': %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "nu pot crea directorul `%s': %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "nu pot crea `%s': %s\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "eroare trimitere la `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "actualizarea a e�uat: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "scriu cheia secret� �n `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
 #, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "verificarea CHV%d a e�uat: %s\n"
+msgid "directory `%s' created\n"
+msgstr "director `%s' creat\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
-msgstr "accesul la comenzile de administrare nu este configurat�\n"
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
-msgstr "eroare la recuperarea st�rii CHV de pe card\n"
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: nu pot crea director: %s\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
-msgstr "cardul este �ncuiat permanent!\n"
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1432
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
-msgstr "|A|PIN Admin"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
-msgstr "|AN|PIN Admin Nou"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
-msgstr "|N|PIN Nou"
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, fuzzy, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "actualizarea secretului a e�uat: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: s�rit�: %s\n"
+
+#: agent/gpg-agent.c:1650
+#, fuzzy
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "eroare la ob�inere noului PIN: %s\n"
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
-msgid "error reading application data\n"
-msgstr "eroare la citirea datelor aplica�iei\n"
+#: agent/preset-passphrase.c:100
+#, fuzzy
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
-msgid "error reading fingerprint DO\n"
-msgstr "eroare la citirea amprentei DO\n"
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
-msgid "key already exists\n"
-msgstr "cheia exist� deja\n"
+#: agent/protect-tool.c:146
+#, fuzzy
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
-msgstr "cheia existent� va fi �nlocuit�\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1568
-msgid "generating new key\n"
-msgstr "generez o nou� cheie\n"
+#: agent/protect-tool.c:1206
+#, fuzzy
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr ""
+"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
-msgstr "timestamp-ul de creare lipse�te\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr ""
+"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+msgstr ""
+
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr ""
+"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "fraz�-parol� incorect�"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "eroare la crearea frazei-parol�: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "anulat�"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "eroare �n `%s': %s\n"
 
-#: g10/app-openpgp.c:1742
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "fi�ier op�iuni `%s': %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
 #, fuzzy, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
+msgid "system trustlist `%s' not available\n"
+msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "eroare citire �n `%s': %s\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "eroare la citire `%s': %s\n"
 
-#: g10/app-openpgp.c:1827
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "failed to store the key: %s\n"
-msgstr "am e�uat s� stochez cheia: %s\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
-msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1901
-msgid "generating key failed\n"
-msgstr "generarea cheii a e�uat\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
+
+#: agent/trustlist.c:453
+#, fuzzy
+msgid "Yes"
+msgstr "da"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
+#, fuzzy, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "eroare la crearea frazei-parol�: %s\n"
+
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "generarea cheii este complet� (%d secunde)\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
+#: common/exechelp.c:446
+#, fuzzy, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:452 common/exechelp.c:492
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "semn�tur� %s, algoritm rezumat %s\n"
+msgid "error running `%s': exit status %d\n"
+msgstr "eroare la citire `%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "semn�turi create p�n� acum: %lu\n"
+msgid "error running `%s': probably not installed\n"
+msgstr ""
+
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "eroare la creearea `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[ID utilizator nu a fost g�sit]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: g10/app-openpgp.c:2142
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
-msgstr ""
-"verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "probleme de comunicare cu gpg-agent\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "anulat� de utilizator\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/sysutils.c:88 g10/misc.c:137
 #, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
+msgid "can't disable core dumps: %s\n"
+msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "da"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "dD"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "nu"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "termin�"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "tT"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr "OK|OK"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr "renun��|renun��"
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:115
+msgid "cC"
+msgstr "cC"
 
 #: g10/armor.c:320
 #, c-format
@@ -385,163 +814,200 @@ msgstr ""
 "caracter printabil �n ghilimele �n armur� - probabil a fost folosit un MTA "
 "cu bug-uri\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+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/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
+
+#: g10/build-packet.c:962
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
+
+#: g10/build-packet.c:980
+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/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "ilizibil"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "cardul OpenPGP nu e disponibil: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[nesetat(�)]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr "feminin"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "nespecificat(�)"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr "nefor�at(�)"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr "for�at(�)"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia public�: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 msgid "Language preferences: "
 msgstr "Preferin�e limb�: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 msgid "Error: invalid response.\n"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opera�ia pe cheie nu e posibil�: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "�nlocuiesc cheia existent�? (d/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Creez copie de rezerv� a cheii de cifrare �n afara cardului? (d/N) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr "�nlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -552,193 +1018,139 @@ msgstr ""
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui s� le schimba�i folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "V� rug�m selecta�i unde s� fie stocat� cheia:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "algoritm de protec�ie a cheii necunoscut\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "afi�eaz� toate datele disponibile"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "schimb� numele purt�torului cardului"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "schimb� URL-ul de unde s� fie adus� cheia"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificat� de URL-ul de pe card"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "schimb� numele de login"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "schimb� preferin�ele de limb�"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "schimb� sexul purt�torului cardului"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "schimb� o amprent� CA"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "comut� fanionul PIN de for�are a semn�turii"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "genereaz� noi chei"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr "verific� PIN-ul �i listeaz� toate datele"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "Comand� numai-administrare\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "cheia secret� nu e disponibil�"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-"V� rug�m introduce�i cardul �i ap�sa�i return sau ap�sa�i 'c' pentru a "
-"renun�a: "
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "stergere keyblock a e�uat: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-"V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de serie:\n"
-"   %.*s\n"
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr "Ap�sa�i return c�nd sunte�i gata sau ap�sa�i 'c' pentru a renun�a: "
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr "Introduce�i noul PIN Admin: "
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr "introduce�i noul PIN: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr "Introduce�i PIN Admin: "
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr "Introduce�i PIN: "
-
-#: g10/cardglue.c:937
-msgid "Repeat this PIN: "
-msgstr "Repeta�i acest PIN: "
-
-#: g10/cardglue.c:952
-msgid "PIN not correctly repeated; try again"
-msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output nu merge pentru aceast� comand�\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -780,47 +1192,47 @@ msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 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:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "folosesc cifrul %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "citesc din `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -828,7 +1240,7 @@ msgstr ""
 "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -837,167 +1249,200 @@ msgstr ""
 "AVERTISMENT: for��nd algoritmul de compresie %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, 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:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, 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/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 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:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "problem� cu m�nuirea pachetului cifrat\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "nu pot crea directorul `%s': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "aceast� platform� necesit� fi�iere temporare c�nd sunt chemate programe "
 "externe\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nu pot executa programul `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nu pot executa shell-ul `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "ie�ire nenatural� a programului extern\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "nu pot executa programul extern\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nu pot citi r�spunsul programului extern: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "cheie secret� de nefolosit"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 msgid "exporting secret keys not allowed\n"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cheia %s: nu e protejat� - s�rit�\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cheia %s: cheie stil PGP 2.x - s�rit�\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVERTISMENT: cheia secret� %s nu are un checksum SK simplu\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
+
+#: g10/getkey.c:176
+msgid "[User ID not found]"
+msgstr "[ID utilizator nu a fost g�sit]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
+
+#: g10/getkey.c:2612
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
+
+#: g10/getkey.c:2659
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1005,127 +1450,128 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1135,51 +1581,47 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "locvace"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1187,7 +1629,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1207,15 +1649,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1225,7 +1667,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1233,77 +1675,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, 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/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1311,21 +1753,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1333,550 +1775,492 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "fi�ier op�iuni `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "citesc op�iuni din `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, 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/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2826
-#, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "NOT�: %s nu este disponibil �n aceast� sesiune\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 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/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:2986
+#: g10/gpg.c:3010
 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/gpg.c:2988
+#: g10/gpg.c:3012
 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/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 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/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
-
-#: g10/getkey.c:175
-msgid "[User ID not found]"
-msgstr "[ID utilizator nu a fost g�sit]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
-
-#: g10/getkey.c:2611
-#, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
-
-#: g10/getkey.c:2658
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "fii oarecum mai t�cut"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "ia cheile de pe acest inel de chei"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "d� numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1884,7 +2268,7 @@ msgstr ""
 "Sintax�: gpg [op�iuni] [fi�iere]\n"
 "Verific� semn�turi folosind cheile cunoscute ca fiind de �ncredere\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1895,7 +2279,7 @@ msgstr ""
 "implement�m re�eaua-de-�ncredere; aceasta nu are nimic �n comun cu\n"
 "certificatele-de-re�ea (create implicit)."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1907,18 +2291,18 @@ msgstr ""
 "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:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1943,7 +2327,7 @@ msgstr ""
 "Prima cheie (primar�) trebuie s� fie �ntotdeauna o cheie cu care se poate "
 "semna."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1953,16 +2337,16 @@ msgstr ""
 "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:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Introduce�i lungimea cheii"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "R�spunde�i \"da\" sau \"nu\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1974,19 +2358,19 @@ msgstr ""
 "ob�ine un r�spuns de eroare bun - �n loc sistemul �ncearc� s�\n"
 "interpreteze valoare dat� ca un interval."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Introduce�i numele de�in�torului cheii"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 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:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "V� rug�m introduce�i un comentriu op�ional"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2000,12 +2384,12 @@ msgstr ""
 "O  pentru a continua cu generarea cheii.\n"
 "T  pentru a termina generarea cheii."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2079,11 +2463,11 @@ msgstr ""
 "\n"
 "Dac� nu �ti�i care este r�spunsul, r�spunde�i \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if 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:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2091,11 +2475,11 @@ 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:195
+#: g10/helptext.c:197
 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:200
+#: g10/helptext.c:202
 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"
@@ -2106,7 +2490,7 @@ msgstr ""
 "stabilirea conexiunii de �ncredere la cheie sau alt� cheie certificat�\n"
 "de aceast� cheie."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2118,7 +2502,7 @@ msgstr ""
 "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:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2126,7 +2510,7 @@ msgstr ""
 "Semn�tura nu este valid�.  Aceasta ar trebui �tears� de pe inelul\n"
 "d-voastr� de chei."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2140,7 +2524,7 @@ msgstr ""
 "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:223
+#: g10/helptext.c:225
 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"
@@ -2150,25 +2534,25 @@ msgstr ""
 "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:230
+#: g10/helptext.c:232
 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:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 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:245
+#: g10/helptext.c:247
 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:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2176,7 +2560,7 @@ 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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2205,7 +2589,7 @@ msgstr ""
 "folosit;\n"
 "      de obicei folosit� pentru a marca o adres� de email ca invalid�.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2215,11 +2599,11 @@ msgstr ""
 "certificat de revocare.  V� rug�m fi�i concis.\n"
 "O linie goal� termin� textul.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Nici un ajutor disponibil"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nici un disponibil disponibil pentru `%s'"
@@ -2255,495 +2639,490 @@ msgstr "cheie secret� de nefolosit"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "bloc de tip %d s�rit\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chei procesate p�n� acum\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Num�r total procesate: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      chei noi s�rite: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  f�r� ID-uri utilizator: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "               importate: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             neschimbate: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "   noi ID-uri utilizator: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             noi subchei: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           noi semn�turi: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    noi revoc�ri de chei: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chei secrete importate: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chei secrete neschimbate: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            ne importate: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, fuzzy, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "algoritmuri pentru aceste ID-uri utilizator:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm rezumat %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm compresie %s\n"
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 "este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
 "algoritm\n"
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 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:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nou� - s�rit�\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, 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:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %s: cheia public� \"%s\" importat�\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secret� importat�\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cheia %s: deja �n inelul de chei secrete\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cheia %s: cheia secret� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
 "\"\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalid�\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalid�\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am s�rit subcheia\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
 "prezent�.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOT�: S/N-ul unei chei nu se potrive�te cu cel al cardului\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOT�: cheia primar� este online �i stocat� pe card\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOT�: cheia secundar� este online �i stocat� pe card\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "resurs� keyblock `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[revocare]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[auto-semn�tur�]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 semn�tur� incorect�\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d semn�turi incorecte\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 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:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 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:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, 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:357
+#: g10/keyedit.c:358
 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:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2754,17 +3133,17 @@ msgstr ""
 "pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
 "verific�nd amprentele din diferite surse, etc.)\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Am o �ncredere marginal�\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Am toat� �ncrederea\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2774,47 +3153,47 @@ msgstr ""
 "O ad�ncime mai mare de 1 permite ca cheia pe care o semna�i s� fac�\n"
 "semn�turi de �ncredere �n numele d-voastr�.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "V� rug�m s� introduce�i domeniul de restric�ionare al acestei semn�turi, sau "
 "ap�sa�i enter pentru niciunul.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 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:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID utilizator \"%s\" este expirat."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID-ul utilizator \"%s\" poate fi semnat.  "
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "Dori�i s�-l semna�i? (d/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2823,11 +3202,11 @@ msgstr ""
 "Auto-semn�tura pe \"%s\"\n"
 "este o semn�tur� stil PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 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:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2836,12 +3215,12 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "a expirat.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2850,43 +3229,43 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "semn�tur� local�.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 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:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� local de cheia %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 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:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Aceast� cheie a expirat!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aceast� cheie va expira pe %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2894,11 +3273,11 @@ 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:891
+#: g10/keyedit.c:892
 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2909,31 +3288,31 @@ msgstr ""
 "�ntr-adev�r persoanei numite deasupra?  Dac� nu �ti�i ce s� r�spunde�i,\n"
 "introduce�i \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nu voi r�spunde.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nu am verificat deloc.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, 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:927
+#: g10/keyedit.c:928
 #, 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:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Selec�ia dvs.? (introduce�i `?' pentru informa�ii suplimentare): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2942,76 +3321,76 @@ msgstr ""
 "Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
 "aceast� cheie cu cheia d-voastr� \"%s\" (%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr "Nu am verificat aceast� cheie deloc.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr "Am verificat aceast� cheie superficial.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr "Am verificat aceast� cheie foarte atent.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
 "parol� de schimbat.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 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:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nu pot edita aceast� cheie: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3019,11 +3398,11 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3031,190 +3410,190 @@ msgstr ""
 "Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 msgid "Do you really want to do this? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� face�i acest lucru? (d/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "mut o semn�tur� de cheie �n locul corect\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 msgid "show key fingerprint"
 msgstr "afi�eaz� amprenta cheii"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "enumer� chei �i ID-uri utilizator"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "select subkey N"
 msgstr "selecteaz� subcheia N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 msgid "check signatures"
 msgstr "verific� semn�turi"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "semneaz� ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
 "relevante]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 msgid "sign selected user IDs locally"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "sign selected user IDs with a trust signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "adaug� un ID utilizator"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "adaug� o poz� ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 msgid "delete selected user IDs"
 msgstr "�terge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 msgid "add a subkey"
 msgstr "adaug� o subcheie"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr "mut� o cheie pe un smartcard"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr "mut� o cheie de rezerv� pe un smartcard"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 msgid "delete selected subkeys"
 msgstr "�terge subcheile selectate"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "adaug� o cheie de revocare"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 msgid "delete signatures from the selected user IDs"
 msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr "marcheaz� ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 msgid "toggle between the secret and public key listings"
 msgstr "comut� �ntre listele de chei secrete �i publice"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "enumer� preferin�ele (expert)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "afi�eaz� preferin�ele (detaliat)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 msgid "set preference list for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
 "selectate"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 msgid "revoke selected user IDs"
 msgstr "revoc� ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 msgid "revoke key or selected subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 msgid "enable key"
 msgstr "activeaz� cheia"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 msgid "disable key"
 msgstr "deactiveaz� cheia"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr "arat� pozele pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eroare la citire keyblock secret \"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Cheia secret� este disponibil�.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3226,228 +3605,228 @@ msgstr ""
 "  pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
 "  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "Cheia este revocat�."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Tip de semn�tur� necunoscut `%s'\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 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:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 msgid "Really remove this user ID? (y/N) "
 msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie s� selecta�i exact o cheie.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? (d/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i toat� cheia? (d/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
 "de �ncredere furnizat� de utilizator\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 msgid "Set preference list to:\n"
 msgstr "Seteaz� lista de preferin�e ca:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
 "selectate? (d/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 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:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota�ie:"
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3456,17 +3835,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3475,7 +3854,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3484,54 +3863,54 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 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:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invalid(�)"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3541,364 +3920,369 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 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:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 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 un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 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:4639
+#: g10/keyedit.c:4640
 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:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 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:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, 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:4922
+#: g10/keyedit.c:4923
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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 %s (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferin�a `%s' duplicat�\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "prea multe preferin�e de cifrare\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "prea multe preferin�e de rezumat\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "prea multe preferin�e de compresie\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "articol invalid `%s' �n �irul de preferin�e\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "scriu semn�tur� direct�\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "scriu auto semn�tur�\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr "Semneaz�"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 msgid "Encrypt"
 msgstr "Cifreaz�"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr "Autentific�"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Ac�iuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr "Ac�iuni permise curent: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Comut� capabilitatea de semnare\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Comut� capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Comut� capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecta�i ce fel de cheie dori�i:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �i Elgamal (implicit)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (numai cifrare)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Perechea de chei DSA va avea %u bi�i.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "cheile %s pot avea lungimea �ntre %u �i %u bi�i.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie dori�i? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "dimensiunile cheii %s trebuie s� fie �n intervalul %u-%u\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesar� este %u bi�i\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjit� prin adaos la %u bi�i\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3914,7 +4298,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3930,38 +4314,38 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semn�tura este valid� pentru? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expir� deloc\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 msgid "Signature does not expire at all\n"
 msgstr "Semn�tura nu expir� deloc\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expir� pe %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semn�tura expir� pe %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3969,11 +4353,11 @@ 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:1692
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3990,44 +4374,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 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:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4038,7 +4422,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
 
@@ -4053,23 +4437,23 @@ msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4077,12 +4461,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4093,7 +4477,7 @@ msgstr ""
 "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:1926
+#: g10/keygen.c:2094
 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"
@@ -4105,50 +4489,50 @@ msgstr ""
 "�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:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, 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:3047
+#: g10/keygen.c:3228
 #, 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:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4158,12 +4542,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4171,7 +4555,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4179,30 +4563,30 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "niciodat� "
 
@@ -4230,625 +4614,598 @@ msgstr "Notare semn�tur�: "
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Amprent� cheie primar�:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "     Amprent� subcheie:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Amprent� cheie primar�:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "      Amprent� subcheie:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 msgid "      Key fingerprint ="
 msgstr "      Amprent� cheie ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr "      Card nr. serie ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTISMENT: exist� 2 fi�iere cu informa�ii confiden�iale.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s este cel neschimbat\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s este cel nou\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "V� rug�m repara�i aceast� deficien�� posibil� de securitate\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "pun �n cache inelul de chei `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chei puse �n cache (%lu semn�turi)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: inelul de chei creat\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISMENT: op�iunile serverului de chei `%s' nu sunt folosite pe aceast� "
 "platform�\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr "deactivat(�)"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cheia \"%s\" nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "cer cheia %s de la serverul %s %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "trimit cheia %s serverului %s %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 msgid "no keyserver action!\n"
 msgstr "nici o ac�iune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
 "s)\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "apeluri c�tre server de chei extern nu este suportat de acest program\n"
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nu suport� versiunea de manipulator (handler) %d\n"
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 msgid "keyserver timed out\n"
 msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 msgid "keyserver internal error\n"
 msgstr "eroare intern� server de chei\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "eroare de comunicare server de chei: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "reactualizez 1 cheie de la %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "reactualizez %d chei de la %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, 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:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrat�\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "fraza-parol� generat� cu un algoritm rezumat necunoscut %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia public� este %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie public�: DEK bun\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrat cu cheia %u-bit %s, ID %s, creat� %s\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie public� a e�uat: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrat� cu %lu fraze-parol�\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrat� cu 1 fraz�-parol�\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fi�ier original='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Semn�tur� f�cut� %s folosind cheia %s cu ID %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semn�tur� INCORECT� din \"%s\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semn�tur� expirat� din \"%s\""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "semn�tur� de sine st�t�toare (standalone) de clas� 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul cu cheie public� experimental %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul de cifrare experimental %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = arat�-mi mai multe informa�ii\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTISMENT: \"%s\" este o comand� �nvechit� - nu o folosi�i\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fi�ierul `%s' exist�. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 msgid "Overwrite? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufix necunoscut\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Introduce�i un nou nume-fi�ier"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "scriu la stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "presupun date semnate �n `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "fi�ier de configurare nou `%s' creat\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, c-format
-msgid "directory `%s' created\n"
-msgstr "director `%s' creat\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 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:1157
+#: g10/parse-packet.c:1211
 #, 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:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
-
-#: g10/passphrase.c:345
-#, 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:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "nu m� pot conecta la `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem� cu agentul - deactivez  folosirea agentului\n"
@@ -4914,7 +5271,7 @@ msgstr "         (subcheie pe cheia principal� ID %s)"
 msgid "Repeat passphrase: "
 msgstr "Repeta�i fraza-parol�: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4930,38 +5287,34 @@ msgstr ""
 "foarte larg�!\n"
 "�ncerca�i s� folosi�i o imagine de aproximativ 240x288 pixeli.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduce�i nume-fi�ier JPEG pentru poz� ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nu pot deschide fi�ierul JPEG `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Acest JPEG este foarte mare (%d octe�i) !\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �l folosi�i? (d/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' nu este un fi�ier JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Este aceast� poz� corect� (d/N/t)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "nu pot afi�a poza ID!\n"
 
@@ -5241,63 +5594,58 @@ 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:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "eroare la creearea `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Semn�tur� deta�at�.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "V� rug�m introduce�i numele fi�ierului de date: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "citesc stdin ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "nici o dat� semnat�\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nu pot deschide date semnate `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinator anonim; �ncerc cheia secret� %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, noi suntem destinatarul anonim.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vechea encodare a lui DEK nu este suportat�\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "AVERTISMENT: algoritm cifrare %s nu a fost g�sit �n preferin�ele "
 "destinatarului\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOT�: cheia secret� %s a expirat la %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
@@ -5416,91 +5764,91 @@ msgstr "(Nici o descriere dat�)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Este aceasta OK? (d/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, 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:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Fraz�-parol� invalid�; v� rug�m mai �ncerca�i o dat�"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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:366
+#: g10/seckey-cert.c:406
 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/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "cheie slab� creat� - re�ncerc\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, 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:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISMENT: conflict pentru rezumat semn�tur� �n mesaj\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s are o certificare-reciproc� invalid� "
 "(invalid cross-certification)\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "cheie public� %s este mai nou� cu %lu secunde dec�t semn�tura\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5508,7 +5856,7 @@ msgstr ""
 "cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5516,52 +5864,52 @@ msgstr ""
 "cheia %s a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOT�: cheia semn�turii %s a expirat %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "presupun semn�tur� incorect� din cheia %s datorit� unui bit critic "
 "necunoscut\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura de revocare a subcheii\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5569,7 +5917,7 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare).  �l folosesc "
 "neexpandat.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5588,11 +5936,11 @@ msgstr "verificarea semn�turii create a e�uat: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semn�tur� de la: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5600,38 +5948,38 @@ msgstr ""
 "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
 "destinatarului\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 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:158
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "s�rit� \"%s\": duplicat�\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "s�rit� \"%s\": %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "s�rit�: cheia secret� deja prezent�\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "aceasta este o cheie ElGamal generat� de PGP care nu e sigur� pentru "
@@ -5687,51 +6035,51 @@ msgstr "eroare citire �n `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a e�uat: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "tranzac�ia trustdb prea mare\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directorul nu exist�!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nu pot crea �ncuietoare (lock) pentru `%s'\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "nu pot �ncuia (lock) `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: am e�uat s� creez �nregistrare versiune: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: a fost creat trustdb invalid\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: a fost creat trustdb\n"
@@ -5740,78 +6088,78 @@ msgstr "%s: a fost creat trustdb\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOT�: nu poate fi scris �n trustdb\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb invalid\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: am e�uat s� creez hashtable: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eroare actualizare �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eroare citire �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eroare scriere �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nu e un fi�ier trustdb\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �nregistrare versiune cu recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versiune fi�ier invalid� %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eroare citire �nregistrare liber�: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eroare scriere �nregistrare dir: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, 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:1459
+#: g10/tdbio.c:1452
 #, 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:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
 
@@ -5820,7 +6168,7 @@ msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
 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:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linii de intrare mai lungi de %d caractere\n"
@@ -5988,7 +6336,7 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "nu pot actualiza �nregistrare versiunii trustdb: scrierea a e�uat: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5998,345 +6346,1636 @@ msgstr ""
 "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:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "eroare general�"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "a�i g�sit un bug ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "tip de pachet necunoscut"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "versiune necunoscut�"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "algoritm pubkey necunoscut"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "algoritm rezumat necunoscut"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "cheie public� incorect�"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "cheie secret� incorect�"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "semn�tur� incorect�"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "eroare checksum"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "fraz�-parol� incorect�"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "cheia public� nu a fost g�sit�"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "algoritm cifrare necunoscut"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "nu pot deschide inelul de chei"
+#: scd/app-openpgp.c:609
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "am e�uat s� stochez data cre�rii: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "pachet invalid"
+#: scd/app-openpgp.c:1004
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "armur� invalid�"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr "r�spunsul nu con�ine datele cheii publice\n"
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "nu exist� acest id utilizator"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr "r�spunsul nu con�ine modulul RSA\n"
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "cheia secret� nu e disponibil�"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "a fost folosit� o cheie secret� gre�it�"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "apelul PIN a returnat eroare: %s\n"
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "nu este suportat(�)"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "cheie incorect�"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verificarea CHV%d a e�uat: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "eroare citire fi�ier"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "eroare scriere fi�ier"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "algoritm compresie necunoscut"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr "cardul este �ncuiat permanent!\n"
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "eroare deschidere fi�ier"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "eroare creare fi�ier"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr "|A|PIN Admin"
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "fraz�-parol� invalid�"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr "|AN|PIN Admin Nou"
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algoritm pubkey neimplementat"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr "|N|PIN Nou"
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "algoritm cifrare neimplementat"
+#: scd/app-openpgp.c:1535
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "clas� semn�turi necunoscut�"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+msgid "error reading application data\n"
+msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "eroare baz� de date �ncredere"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+msgid "error reading fingerprint DO\n"
+msgstr "eroare la citirea amprentei DO\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "MPI incorect"
+#: scd/app-openpgp.c:1601
+msgid "key already exists\n"
+msgstr "cheia exist� deja\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "limit� resurse"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "inel de chei invalid"
+#: scd/app-openpgp.c:1607
+msgid "generating new key\n"
+msgstr "generez o nou� cheie\n"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "certificat incorect"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr "timestamp-ul de creare lipse�te\n"
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "id utilizator anormal"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "eroare �nchidere fi�ier"
+#: scd/app-openpgp.c:1788
+#, fuzzy, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "eroare redenumire fi�ier"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "eroare �tergere fi�ier"
+#: scd/app-openpgp.c:1866
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "date nea�teptate"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "conflict timestamp"
+#: scd/app-openpgp.c:1939
+msgid "generating key failed\n"
+msgstr "generarea cheii a e�uat\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "algoritm pubkey nefolosibil"
+#: scd/app-openpgp.c:1942
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "fi�ierul exist�"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "cheie slab�"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "argument invalid"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "URI incorect"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "URI nesuportat"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "eroare re�ea"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "necifrat"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "citesc op�iuni din `%s'\n"
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "neprocesat"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "cheie public� de nefolosit"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "cheie secret� de nefolosit"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "eroare server de chei"
+#: scd/scdaemon.c:126
+#, fuzzy
+msgid "do not use the internal CCID driver"
+msgstr "nu folosi deloc terminalul"
 
-#: util/errors.c:109
-msgid "canceled"
-msgstr "anulat�"
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
-msgid "no card"
-msgstr "nici un card"
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "arat� comenzi administrare"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "nici o dat� semnat�\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
 
-#: util/logger.c:158
-msgid "ERROR: "
-msgstr "EROARE: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
-msgstr "AVERTISMENT: "
+#: scd/scdaemon.c:1008
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... acesta este un bug (%s:%d:%s)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#: util/logger.c:230
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "caracter radix64 invalid %02X s�rit\n"
+
+#: sm/call-dirmngr.c:182
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "a�i g�sit un bug ... (%s:%d)\n"
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "da"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "dD"
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "gpg-agent versiune protocol %d nu este suportat\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "Nu pot deschide `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "exportul cheilor secrete nu este permis\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "am e�uat s� stochez cheia: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "NOT�: cheia a fost revocat�"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "certificat incorect"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Cheie disponibil� la: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "verificarea semn�turii create a e�uat: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "genereaz� un certificat de revocare"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Aceast� cheie a expirat!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "Amprenta CA: "
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "verificarea semn�turii create a e�uat: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "verific� o semn�tur�"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+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"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "nu"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "[nesetat(�)]"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "Eroare: r�spuns invalid.\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "Eroare: r�spuns invalid.\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pt. "
+"utilizator:\n"
+"\"%.*s\"\n"
+"cheia %u-bit %s, ID %s, creat� %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "algoritm hash invalid `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Nu este o adres� de email valid�\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Generarea cheii a e�uat: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "eroare la citire keyblock: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "Certificat de revocare creat.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "preferin�a `%s' duplicat�\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "stergere keyblock a e�uat: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(Nici o descriere dat�)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "eroare la crearea frazei-parol�: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: eroare scriere �nregistrare dir: %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[fi�ier]|creaz� o semn�tur�"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "enumer� chei secrete"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "certificat incorect"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "�terge chei de pe inelul de chei public"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "certificat incorect"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "certificat incorect"
+
+#: sm/gpgsm.c:263
+#, fuzzy
+msgid "register a smartcard"
+msgstr "adaug� o cheie la un smartcard"
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "schimb� fraza-parol�"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "creaz� ie�ire �n armur� ascii"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NUME|folose�te NUME ca destinatar implicit"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "folose�te cheia implicit� ca destinatar implicit"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "nu folosi deloc terminalul"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "for�eaz� semn�turi v3"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "folose�te �ntotdeauna un MDC pentru cifrare"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "modul batch: nu �ntreba niciodat�"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "presupune da la cele mai multe �ntreb�ri"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "presupune nu la cele mai multe �ntreb�ri"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "adaug� acest inel de chei la lista inelelor de chei"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "adaug� acest inel de chei secret la list�"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NUME|folose�te algoritm cifrare NUME"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|folose�te algoritm compresie N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\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"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "folosire: gpg [op�iuni] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "nu m� pot conecta la `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "nu pot accesa `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Num�r total procesate: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "genereaz� un certificat de revocare"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "eroare la ob�inerea num�rului serial: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "inelul de chei `%s' creat\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "am e�uat s� stochez amprenta: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "am e�uat s� stochez cheia: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "eroare la ob�inerea num�rului serial: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "eroare la ob�inerea num�rului serial: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? probleme la verificare revoc�rii: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "eroare la ob�inere noului PIN: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "Eroare: amprent� formatat� invalid.\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "verificarea semn�turii create a e�uat: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Semn�tur� f�cut� %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Semn�tur� bun� din \"%s\""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                aka \"%s\""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "termin�"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "tT"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
-msgstr "OK|OK"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
-msgstr "renun��|renun��"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
+msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
-msgstr "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
+msgstr ""
 
-#: util/miscutil.c:411
-msgid "cC"
-msgstr "cC"
+#: tools/gpg-connect-agent.c:126
+#, fuzzy
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "linie prea lung�"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "op�iune necunoscut� `%s'\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "semnarea a e�uat: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "citirea cheii publice a e�uat: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "eroare trimitere la `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "eroare trimitere la `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "folosire: gpg [op�iuni] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "cheia public� nu a fost g�sit�"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Comenzi:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "decriptare OK\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "decriptare OK\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [nume_fi�ier]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s nu este permis cu %s!\n"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "AVERTISMENT: este folosit� memorie neprotejat� (insecure)!\n"
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
 
-#: util/secmem.c:98
-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"
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "nu pot crea directorul `%s': %s\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "nu pot deschide %s: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "eroare la scrierea inelului de chei `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "eroare �n `%s': %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
 msgstr ""
-"opera�ia nu este posibil� f�r� memorie protejat� (secure) ini�ializat�\n"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
 
-#~ 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"
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "nu pot crea `%s': %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "nu pot crea `%s': %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "actualizarea a e�uat: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "stergere keyblock a e�uat: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "actualizarea a e�uat: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "actualizarea a e�uat: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "actualizarea a e�uat: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "nu pot deschide fi�ierul: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "algoritm rezumat %d nu este suportat\n"
+
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "nu pot genera un num�r prim cu  pbi�i=%u qbi�i=%u\n"
+
+#~ 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"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "nu pot �ncuia (lock) `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "scriu cheia secret� �n `%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "nu pot ob�ine statistici `%s': %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' nu este un fi�ier normal - ignorat\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "not�: fi�ier random_seed este gol\n"
+
+#~ 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"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "nu pot citi `%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "nu pot scrie `%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "nu pot �nchide `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr ""
+#~ "AVERISMENT: este folosit un generator de numere aleatoare nesigur "
+#~ "(insecure)!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "vede�i http://www.gnupg.org/why-not-idea.html pentru informa�ii "
-#~ "suplimentare\n"
+#~ "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"
+
+#~ 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"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "\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 ""
-#~ "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau "
-#~ "spa�ii �i s� se termine cu un '='\n"
+#~ "\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"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "cheia secret� nu e disponibil�"
 
-#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
 #~ msgstr ""
-#~ "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
+#~ "V� rug�m introduce�i cardul �i ap�sa�i return sau ap�sa�i 'c' pentru a "
+#~ "renun�a: "
 
-#~ msgid "a notation value must not use any control characters\n"
+#~ msgid ""
+#~ "Please remove the current card and insert the one with serial number:\n"
+#~ "   %.*s\n"
 #~ msgstr ""
-#~ "o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de "
-#~ "control\n"
+#~ "V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de serie:\n"
+#~ "   %.*s\n"
+
+#~ msgid "Hit return when ready or enter 'c' to cancel: "
+#~ msgstr "Ap�sa�i return c�nd sunte�i gata sau ap�sa�i 'c' pentru a renun�a: "
+
+#~ msgid "Enter New Admin PIN: "
+#~ msgstr "Introduce�i noul PIN Admin: "
+
+#~ msgid "Enter New PIN: "
+#~ msgstr "introduce�i noul PIN: "
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
+#~ msgid "Enter Admin PIN: "
+#~ msgstr "Introduce�i PIN Admin: "
 
-#~ msgid "not human readable"
-#~ msgstr "ilizibil"
+#~ msgid "Enter PIN: "
+#~ msgstr "Introduce�i PIN: "
+
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "NOT�: %s nu este disponibil �n aceast� sesiune\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "algoritmuri pentru aceste ID-uri utilizator:\n"
+
+#~ msgid "general error"
+#~ msgstr "eroare general�"
+
+#~ msgid "unknown packet type"
+#~ msgstr "tip de pachet necunoscut"
+
+#~ msgid "unknown version"
+#~ msgstr "versiune necunoscut�"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "algoritm pubkey necunoscut"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "algoritm rezumat necunoscut"
+
+#~ msgid "bad public key"
+#~ msgstr "cheie public� incorect�"
+
+#~ msgid "bad secret key"
+#~ msgstr "cheie secret� incorect�"
+
+#~ msgid "bad signature"
+#~ msgstr "semn�tur� incorect�"
+
+#~ msgid "checksum error"
+#~ msgstr "eroare checksum"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "algoritm cifrare necunoscut"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "nu pot deschide inelul de chei"
+
+#~ msgid "invalid packet"
+#~ msgstr "pachet invalid"
+
+#~ msgid "invalid armor"
+#~ msgstr "armur� invalid�"
+
+#~ msgid "no such user id"
+#~ msgstr "nu exist� acest id utilizator"
+
+#~ msgid "secret key not available"
+#~ msgstr "cheia secret� nu e disponibil�"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "a fost folosit� o cheie secret� gre�it�"
+
+#~ msgid "not supported"
+#~ msgstr "nu este suportat(�)"
+
+#~ msgid "bad key"
+#~ msgstr "cheie incorect�"
+
+#~ msgid "file read error"
+#~ msgstr "eroare citire fi�ier"
+
+#~ msgid "file write error"
+#~ msgstr "eroare scriere fi�ier"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "algoritm compresie necunoscut"
+
+#~ msgid "file open error"
+#~ msgstr "eroare deschidere fi�ier"
+
+#~ msgid "file create error"
+#~ msgstr "eroare creare fi�ier"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "fraz�-parol� invalid�"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algoritm pubkey neimplementat"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "algoritm cifrare neimplementat"
+
+#~ msgid "unknown signature class"
+#~ msgstr "clas� semn�turi necunoscut�"
+
+#~ msgid "trust database error"
+#~ msgstr "eroare baz� de date �ncredere"
+
+#~ msgid "resource limit"
+#~ msgstr "limit� resurse"
+
+#~ msgid "invalid keyring"
+#~ msgstr "inel de chei invalid"
+
+#~ msgid "malformed user id"
+#~ msgstr "id utilizator anormal"
+
+#~ msgid "file close error"
+#~ msgstr "eroare �nchidere fi�ier"
+
+#~ msgid "file rename error"
+#~ msgstr "eroare redenumire fi�ier"
+
+#~ msgid "file delete error"
+#~ msgstr "eroare �tergere fi�ier"
+
+#~ msgid "unexpected data"
+#~ msgstr "date nea�teptate"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "conflict timestamp"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "algoritm pubkey nefolosibil"
+
+#~ msgid "file exists"
+#~ msgstr "fi�ierul exist�"
+
+#~ msgid "weak key"
+#~ msgstr "cheie slab�"
+
+#~ msgid "invalid argument"
+#~ msgstr "argument invalid"
+
+#~ msgid "bad URI"
+#~ msgstr "URI incorect"
+
+#~ msgid "unsupported URI"
+#~ msgstr "URI nesuportat"
+
+#~ msgid "network error"
+#~ msgstr "eroare re�ea"
+
+#~ msgid "not encrypted"
+#~ msgstr "necifrat"
+
+#~ msgid "not processed"
+#~ msgstr "neprocesat"
+
+#~ msgid "unusable public key"
+#~ msgstr "cheie public� de nefolosit"
+
+#~ msgid "unusable secret key"
+#~ msgstr "cheie secret� de nefolosit"
+
+#~ msgid "keyserver error"
+#~ msgstr "eroare server de chei"
+
+#~ msgid "no card"
+#~ msgstr "nici un card"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "nici o dat� semnat�\n"
+
+#~ msgid "ERROR: "
+#~ msgstr "EROARE: "
+
+#~ msgid "WARNING: "
+#~ msgstr "AVERTISMENT: "
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... acesta este un bug (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "AVERTISMENT: este folosit� memorie neprotejat� (insecure)!\n"
+
+#~ 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"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr ""
+#~ "opera�ia nu este posibil� f�r� memorie protejat� (secure) ini�ializat�\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr ""
+#~ "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
+
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6372,9 +8011,6 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "eroare la ob�inerea num�rului serial: %s\n"
-
 #~ msgid "length of RSA modulus is not %d\n"
 #~ msgstr "lungimea modulului RSA nu este %d\n"
 
@@ -6393,18 +8029,9 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "nu pot convinge serverul s� scrie FD pentru agent\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "probleme de comunicare cu gpg-agent\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "fraz�-parol� prea lung�\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "r�spuns invalid de la agent\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
-
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "algoritm rezumat `%s' este numai-citire �n acest� edi�ie\n"
 
@@ -6447,18 +8074,6 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ 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"
 
@@ -6468,48 +8083,18 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ 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 "|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 "|[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"
 
@@ -6532,15 +8117,6 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ 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"
 
@@ -6565,9 +8141,6 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "--nrlsign-key user-id"
 #~ msgstr "--nrlsign-key id-utilizator"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "nu pot deschide %s: %s\n"
-
 #~ msgid "key %08lX: key has been revoked!\n"
 #~ msgstr "cheia %08lX: cheia a fost revocat�!\n"
 
@@ -6791,9 +8364,6 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- a fost g�sit� o revocare falsificat�\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? probleme la verificare revoc�rii: %s\n"
-
 #~ msgid ""
 #~ "\"\n"
 #~ "locally signed with your key %08lX at %s\n"
@@ -6822,9 +8392,6 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\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"
 
@@ -6883,9 +8450,6 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgstr ""
 #~ "verificare la nivel %d semnat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: nu pot crea director: %s\n"
-
 #~ 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\"."
@@ -6959,9 +8523,6 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "�mi pare r�u, nu pot face acest lucru �n modul batch\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "nu pot deschide fi�ierul: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "eroare: `:' lips�\n"
 
diff --git a/po/ru.po b/po/ru.po
index 77438e4fa..9fc46872e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.4.2\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2005-06-22 02:53+0200\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -16,295 +16,720 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "не могу сгенерировать простое число с pbits=%u qbits=%u\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "сбой сохранения отпечатка: %s\n"
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
-msgstr "не могу сгенерировать простое число меньше чем с %d битами\n"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "не найден модуль накопления энтропии\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Введите парольную фразу (это секретная строка) \n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "невозможно заблокировать `%s'\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "строка слишком длинная"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "строка слишком длинная"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Недопустимый символ в Имени\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "неверный MPI"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "неправильный пароль"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "неправильный пароль"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "сохранение секретного ключа в `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "метод защиты %d не поддерживается\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "не могу создать `%s': %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "не могу выполнить stat `%s': %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "ошибка при получении нового PIN: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' не регулярный файл - проигнорирован\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "замечание: файл random_seed пуст\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "ВНИМАНИЕ: недопустимый размер файла random_seed - не использую\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "не могу прочитать `%s': %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "сбой при чтении ключа: %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "замечание: файл random_seed не обновлен\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "не могу создать `%s': %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Введите парольную фразу (это секретная строка) \n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "не могу записать `%s': %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "не могу закрыть `%s': %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: сбой создания таблицы хэшей: %s\n"
+
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "|A|Административный PID"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "ВНИМАНИЕ: используется небезопасный генератор случайных чисел!!\n"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Повторите ввод PIN: "
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:278
+msgid "PIN not correctly repeated; try again"
+msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
+
+#: agent/divert-scd.c:290
+#, fuzzy, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "||Введите PIN%%0A[подписей: %lu]"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
-"Генератор случайных чисел - это только заглушка для того,\n"
-"чтобы программа могла работать и он НЕ МОЖЕТ применяться\n"
-"для генерации надежных случайных чисел!\n"
-"\n"
-"НЕ ПОЛЬЗУЙТЕСЬ ДАННЫМИ СОЗДАННЫМИ ЭТОЙ ВЕРСИЕЙ ПРОГРАММЫ!!\n"
+"Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "сменить пароль"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "сменить пароль"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"Программа собирает случайные данные. Это может занять некоторое время.\n"
-"Вы можете выполнять в это время какую-нибудь работу, это спасет от скуки\n"
-"и увеличит качество и скорость сбора случайных данных.\n"
+"@\n"
+"Параметры:\n"
+" "
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
+
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "подробно"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "уменьшить количество выводимой информации"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "параметры конфигурации взяты из файла `%s'\n"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "искать ключи на сервере ключей"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "установить список предпочтений для выбранных User ID"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "обновить таблицу доверий"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
-"\n"
-"Недостаточно случайных чисел.  Выполняйте какие-либо действия для того,\n"
-"чтобы ОС могла получить больше случайных данных! (Необходимо ещё %d байт)\n"
 
-#: g10/app-openpgp.c:596
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "сбой сохранения отпечатка: %s\n"
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:609
+#: agent/gpg-agent.c:303
 #, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "сбой сохранения даты создания: %s\n"
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:977
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
 #, c-format
-msgid "reading public key failed: %s\n"
-msgstr "сбой при чтении ключа: %s\n"
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
-msgstr "ответ не содержит данных открытого ключа\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
-msgstr "в ответе отсутствует модуль RSA\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
-msgstr "в ответе отсутствует открытая экспонента RSA\n"
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "файл конфигурации `%s': %s\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
 #, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgid "reading options from `%s'\n"
+msgstr "параметры конфигурации взяты из файла `%s'\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
+msgid "error creating `%s': %s\n"
+msgstr "ошибка создания `%s': %s\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
 #, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "при проверке CHV%d сбой: %s\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "не могу создать каталог `%s': %s\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
-msgstr "доступ к командам управления не настроен\n"
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
-msgstr "ошибка получения статуса CHV с карты\n"
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "не могу создать `%s': %s\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
-msgstr "карта заблокирована!\n"
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "ошибка при поиске записи о доверии в `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "сбой при обновлении: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "directory `%s' created\n"
+msgstr "создан каталог `%s'\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "файл конфигурации `%s': %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "не могу создать каталог `%s': %s\n"
+
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
-"осталось %d попыток ввода административного PIN перед блокировкой карты\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
-msgstr "|A|Административный PID"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
-msgstr "|AN|Новый административный PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
-msgstr "|N|Новый PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, fuzzy, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "сбой при обновлений секретного ключа: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: пропущено: %s\n"
+
+#: agent/gpg-agent.c:1650
+#, fuzzy
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent недоступен в данной сессии\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "ошибка при получении нового PIN: %s\n"
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "протокол gpg-agent версии %d не поддерживается\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
-msgid "error reading application data\n"
-msgstr "ошибка чтения данных приложения\n"
+#: agent/preset-passphrase.c:100
+#, fuzzy
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
-msgid "error reading fingerprint DO\n"
-msgstr "ошибка чтения отпечатка DO\n"
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
-msgid "key already exists\n"
-msgstr "ключ уже существует\n"
+#: agent/protect-tool.c:146
+#, fuzzy
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
-msgstr "существующий ключ будет заменен\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1568
-msgid "generating new key\n"
-msgstr "генерация нового ключа\n"
+#: agent/protect-tool.c:1206
+#, fuzzy
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Введите парольную фразу (это секретная строка) \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
-msgstr "пропущен штамп создания создания\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Введите парольную фразу (это секретная строка) \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+msgstr ""
+
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Введите парольную фразу (это секретная строка) \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "неправильный пароль"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "отменено"
 
-#: g10/app-openpgp.c:1742
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "ошибка в `%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "файл конфигурации `%s': %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "секретная часть ключ не доступна\n"
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "ошибка чтения в `%s': %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "ошибка чтения `%s': %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
+msgstr ""
 
-#: g10/app-openpgp.c:1827
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
 #, c-format
-msgid "failed to store the key: %s\n"
-msgstr "сбой сохранения ключа: %s\n"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
-msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
+#: agent/trustlist.c:453
+#, fuzzy
+msgid "Yes"
+msgstr "да"
 
-#: g10/app-openpgp.c:1901
-msgid "generating key failed\n"
-msgstr "сбой при генерации ключа\n"
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
+#, fuzzy, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
+
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "не могу открыть подписанные данные `%s'\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "ключ сгенерирован (%d секунд)\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
+#: common/exechelp.c:446
+#, fuzzy, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:452 common/exechelp.c:492
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s подпись, хэш-функция %s\n"
+msgid "error running `%s': exit status %d\n"
+msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "подписей создано: %lu\n"
+msgid "error running `%s': probably not installed\n"
+msgstr ""
+
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "ошибка чтения `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "ошибка создания `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[User ID не найден]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: g10/app-openpgp.c:2142
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Введите PIN%%0A[подписей: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "не могу подключиться к `%s': %s\n"
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
 msgstr ""
-"проверка административного PIN в данный момент запрещен этой командой\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/simple-pwquery.c:389
+msgid "problem setting the gpg-agent options\n"
+msgstr ""
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "прервано пользователем\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "проблема с агентом - использование агента отключено\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
 #, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
+msgid "can't disable core dumps: %s\n"
+msgstr "не могу отключить создание файла копии образа памяти: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу модуля расширения `%s'\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "да"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "нет"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr ""
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "quit"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr ""
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr ""
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr ""
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+msgid "cC"
+msgstr ""
 
 #: g10/armor.c:320
 #, c-format
@@ -381,163 +806,199 @@ msgstr ""
 "символы quoted printable в кодировке ASCII - вероятно использовался плохой "
 "MTA\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"имя примечания должно содержать только печатные символы или пробелы,и "
+"заканчиваться знаком '='\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "имя примечания пользователя должно содержать '@' символ\n"
+
+#: g10/build-packet.c:962
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "имя пользователя не должно содержать более одного символа '@'\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "значение примечания не должно содержать управляющие символы\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "ВНИМАНИЕ: найдена недопустимая форма записи данных\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "нечитаемо для человека"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недоступна: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[не установлено]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr "мужской"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr "женский"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "не задан"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка:Допустим только чистый ASCII.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: Нельзя использовать символ \"<\"\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопустимы.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr "Фамилия владельца карты:"
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr "Имя влдаельца карты:"
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Скомбинированное имя слишком длинное (предел %d символов).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr "URL для получения открытого ключа: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr "Учетная запись (имя):"
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Ошибка: Данные учетной записи слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr "Секретные DO данные:"
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Ошибка: Секретные DO данные слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 msgid "Language preferences: "
 msgstr "Предпочитаемый язык: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Пол ((M)Мужской, (F)Женский или пробел): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопустимый ответ.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 msgid "CA fingerprint: "
 msgstr "отпечаток CA: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: неправильный формат отпечатка.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операция с ключом невозможна: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr "карта не OpenPGP"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить существующий ключ? (y/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -548,193 +1009,141 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Вы должны изменить их используя команду --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип создаваемого ключа:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подписи\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифрования\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где сохранить ключ:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты ключа\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "секретные части ключа недоступны\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "показать данную справку"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "вывести все доступные данные"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "изменить имя владельца карты"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "изменить URL получения ключа"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "запросить ключ, указанный по заданному картой URL"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "изменить учетное имя"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "изменить языковые предпочтения"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "изменение пола владельца карты"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "сменить отпечаток CA"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "toggle the signature force PIN flag"
 msgstr "переключение флага force PIN"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "сгенерировать новые ключи"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменения или разблокировки PIN"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 #, fuzzy
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN  и показать все данные"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "Команды администратора\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "Команды администрирования разрешены\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "секретный ключ не найден"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr "Вставьте карту и нажмите Enter или введите 'c' для отмены: "
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "сбой при удалении блока ключа: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-"Извлеките текущую карту и вставьте карту с серийным номером:\n"
-"   %.*s\n"
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr "Нажмите Enter, когда будете готовы или введите 'c' для отмены: "
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr "Введите новый Admin PIN: "
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr "Введите новый PIN: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr "Введите Admin PIN: "
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr "Введите PIN: "
-
-#: g10/cardglue.c:937
-msgid "Repeat this PIN: "
-msgstr "Повторите ввод PIN: "
-
-#: g10/cardglue.c:952
-msgid "PIN not correctly repeated; try again"
-msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output не работает для данной команды\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -774,217 +1183,252 @@ msgstr "имеется секретный ключ для открытого к�
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "сначала используйте опцию \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "не могу использовать симметричный пакет ESK в S2K режиме\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "используемый алгоритм шифрования %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "читаю из `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "не могу использовать шифр IDEA для всех ключей.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ВНИМАНИЕ: использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "ВНИМАНИЕ: сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "Данные зашифрованы алгоритмом %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ВНИМАНИЕ: сообщение было зашифровано слабым ключом симметричного шифра.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "проблема обработки зашифрованного пакета\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "удаленный запуск программы не поддерживается\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "не могу создать каталог `%s': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "вызов внешних программ отключен из-за небезопасных прав доступа\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "на данной платформе требуется использование временных файлов при вызове "
 "внешних программ\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "не могу запустить программу `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "не могу запустить оболочку `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "ошибка системы при вызове внешней программы: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "ненормальное завершение внешней программы\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "не могу запустить внешнюю программу\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "не могу прочитать ответ внешней программы: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный файл (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный каталог `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "ключи отзыва для \"%s\" не найдены\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "удаление неиспользуемых частей из ключа"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 msgid "exporting secret keys not allowed\n"
 msgstr "экспорт секретных ключей не разрешен\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "ключ %s: не защищен - пропущен\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %s: стиля PGP 2.x - пропущен\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ВНИМАНИЕ: секретный ключ %s не имеет простой контрольной суммы SK\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "слишком много входов в pk кэше - отключено\n"
+
+#: g10/getkey.c:176
+msgid "[User ID not found]"
+msgstr "[User ID не найден]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+"Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
+"selfsigned-uid\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
+
+#: g10/getkey.c:2612
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "использую подклключ %s вместо главного ключа %s\n"
+
+#: g10/getkey.c:2659
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -992,127 +1436,128 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[file]|создать подпись к файлу"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|вывести хэши файлов"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1122,51 +1567,47 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "подробно"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1174,7 +1615,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1194,15 +1635,15 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1212,7 +1653,7 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1220,92 +1661,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [опции] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к домашнему каталогу `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу конфигурации `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу модуля расширения `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1313,552 +1754,492 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "файл конфигурации `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "параметры конфигурации взяты из файла `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для нормального применения!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
 # test it
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
 # test it
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
 # test it
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2826
-#, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "ПРЕДУПРЕЖДАЮ: %s недоступен в данной версии\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:2986
+#: g10/gpg.c:3010
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:3012
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s!\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [имяфайла]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [имяфайла]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "слишком много входов в pk кэше - отключено\n"
-
-#: g10/getkey.c:175
-msgid "[User ID not found]"
-msgstr "[User ID не найден]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr ""
-"Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
-"selfsigned-uid\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
-
-#: g10/getkey.c:2611
-#, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "использую подклключ %s вместо главного ключа %s\n"
-
-#: g10/getkey.c:2658
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "уменьшить количество выводимой информации"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "используются ключи из этой таблицы ключей"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии отметки времени - только предупреждением"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1866,7 +2247,7 @@ msgstr ""
 "Синтаксис: gpg [параметры] [файлы]\n"
 "Проверка подписей сделанных доверяемыми ключами\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1876,7 +2257,7 @@ msgstr ""
 "третьей стороне.  Это необходимо для реализации сети доверия web-of-trust;\n"
 " и не имеет ничего общего с (неявно созданной) сетью сертификатов."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1888,17 +2269,17 @@ msgstr ""
 "секретный ключ.  Ответьте \"yes\" для присвоения абсолютного доверия\n"
 "данному ключу\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Если Вы хотите использовать данный недоверяемый ключ - ответьте \"yes\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:68
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Введите User ID адресата, которому Вы хотите отправить сообщение."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1922,7 +2303,7 @@ msgstr ""
 "\n"
 "Первый (главный) ключ всегда должен быть подписывающим."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1933,16 +2314,16 @@ msgstr ""
 "Проконсультируйтесь с Вашим экспертом по безопасности перед тем,\n"
 "как использовать данный ключ."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Введите размер ключа"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Ответьте \"yes\" или \"no\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1954,19 +2335,19 @@ msgstr ""
 "уведомление при ошибке в формате - вместо этого система попробует\n"
 "интерпретировать введенное Вами значение как интервал."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Введите имя владельца ключа"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "введите необязательный, но очень рекомендуемый email адрес"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Введите необязательный комментарий"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1980,11 +2361,11 @@ msgstr ""
 "O  продолжить создание ключа.\n"
 "Q  выйти и прервать создание ключа."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Ответьте \"yes\" (или только \"y\"), если Вы готовы создавать подключ."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:150
 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"
@@ -2053,11 +2434,11 @@ msgstr ""
 "\n"
 "Если Вы не можете определиться с правильным ответом, ответьте \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Ответьте \"yes\", если Вы хотите подписать ВСЕ User ID"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2065,11 +2446,11 @@ msgstr ""
 "Ответьте \"yes\", если Вы действительно хотите удалить данный User ID.\n"
 "Все сертификаты также будут потеряны!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Ответьте \"yes\", если Вы готовы удалить подключ"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2079,7 +2460,7 @@ msgstr ""
 "удалять такие подписи, потому, что она может быть важна для установления\n"
 "достоверности ключа или других ключей подписанных данным ключом."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2091,7 +2472,7 @@ msgstr ""
 "узнаете, какой ключ был использован, т.к. эта подпись может\n"
 "устанавливать достоверность через другие уже удостоверенные ключи."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2099,7 +2480,7 @@ msgstr ""
 "Подпись недействительна.  Это дает основания удалить ее из\n"
 "Вашей связки ключей."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2113,7 +2494,7 @@ msgstr ""
 "Делайте это только если данная самоподпись не действительна по\n"
 "каким-то причинам и существует доступная вторая."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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"
@@ -2123,24 +2504,24 @@ msgstr ""
 "на текущий список предпочтений.  Отметка времени на всех затронутых\n"
 "самоподписях будет увеличена на одну секунду\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Введите парольную фразу (это секретная строка) \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Повторите парольную фразу, чтобы убедиться в том, что она набрана правильно."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "Введите имя файла, к которому относится данная подпись"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Ответьте \"yes\", если Вы хотите перезаписать файл"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2148,7 +2529,7 @@ msgstr ""
 "Введите новое имя файла. Если Вы нажмете только RETURN будет использован\n"
 "по умолчанию тот файл, который показан в квадратных скобках."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2177,7 +2558,7 @@ msgstr ""
 "      Обычно используется, для указания, что данный e-mail больше\n"
 "      не используется\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2187,11 +2568,11 @@ msgstr ""
 "причины создания сертификата отзыва.  Будьте кратки.\n"
 "Для завершения введите пустую строку.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Нет доступной справки"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Нет справки для `%s'"
@@ -2227,494 +2608,489 @@ msgstr "удаление неиспользуемых частей из ключ
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропущен блок типа %d\n"
 
 # test it
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ключей обработано\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Всего обработано: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        пропущено новых ключей: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                   без User ID: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 импортировано: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  неизмененных: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                 новых User ID: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               новых подключей: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                новых подписей: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          новых отзывов ключей: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    прочитано секретных ключей: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "импортировано секретных ключей: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " неизменённых секретных ключей: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              не импортировано: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    подписей очищено: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      очищено User ID: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, fuzzy, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr "ВНИМАНИЕ: ключ %s содержит недопустимые предпочтения\n"
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "алгоритмы для этих User ID:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": предпочитает хеш-функцию %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": предпочитает сжатие %s\n"
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "крайне желательно, чтобы Вы обновили Ваши предпочтения и\n"
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "распространили этот ключ, чтобы избежать потенциальных проблем несовпадения "
 "алгоритмов\n"
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "Вы можете обновить список предпочтений используя:\n"
 "\tgpg --edit-key %s updpref save\n"
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: не имеет User ID\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: PKS повреждение ключа исправлено\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %s: принят без самоподписанного User ID \"%s\"\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет действительных User ID\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиной этого может быть отсутствие самоподписи\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: открытый ключ \"%s\" импортирован\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не совпадает с копией хранимой у нас\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не нахожу оригинальный блок ключей: %s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не могу прочитать оригинальный блок ключей: %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый User ID\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых User ID\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: \"%s\" %d User ID очищен\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: \"%s\" %d  очищенных User ID\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "импортирование секретного ключа не позволено\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: секретный ключ импортирован\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "ключ %s: уже есть в таблице секретных ключей\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "ключ %s: не найден секретный ключ: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: \"%s\" сертификат отзыва импортирован\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет User ID для подписи\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неподдерживаемый алгоритм с открытым ключом у User ID \"%s\" \n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: неправильная самоподпись на User ID \"%s\"\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа для связывания подключей\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: неподдерживаемый алгоритм с открытым ключом\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: неправильная связь подключей\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалено многократное связывание подключей\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа для отзывающего ключа\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неправильный отзыв подключа\n"
 
 # test it
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удалена многожественность подключей отзыва\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен User ID \"%s\"\n"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: не экспортируемая подпись (класс 0x%02X) - пропущена\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: direct key signature добавлена\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "ошибка создания таблицы ключей `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "создана таблица ключей `%s'\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[самоподпись]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 плохая подпись\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d плохих подписей\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 подпись не проверена за отсутствием ключа\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d подписей не проверено за отсутствием ключей\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 подпись не проверена из-за ошибки\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d подписей не проверено из-за ошибок\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "обнаружен 1 User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "обнаружено %d User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2726,17 +3102,17 @@ msgstr ""
 "Проверяет паспорт, сверяет отпечатки ключей и т.п.?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Доверяю ограниченно\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Полностью доверяю\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2747,47 +3123,47 @@ msgstr ""
 "trust signatures on your behalf.\n"
 
 # check it
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Введите домен, ограничивающий использование данной подписи, или пустую "
 "строку, если нет ограничений.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите это подписать? (y/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" просрочен."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" без самоподписи."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\"  подписываем."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2796,11 +3172,11 @@ msgstr ""
 "Самоподпись у \"%s\"\n"
 "это подпись PGP 2.x -стиля.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Вы хотите сделать это OpenPGP самоподписью? (y/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2809,11 +3185,11 @@ msgstr ""
 "Ваша текущая подпись на  \"%s\"\n"
 "просрочена.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2822,55 +3198,55 @@ msgstr ""
 "Ваша текущая подпись на \"%s\"\n"
 "является локальной.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Вы хотите сделать это полностью экспортируемой подписью? (y/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" уже локально подписан ключом %s\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" уже подписан ключом %s\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Вы действительно хотите снова подписать это? (y/N)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Нечего подписывать ключом %s\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Данный ключ просрочен!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Срок действительности данного ключа истекает %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Вы хотите, чтобы Ваша подпись была действительна до того же времени?(Y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:890
 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:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Это сделает ключ несовместимым с PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2880,31 +3256,31 @@ msgstr ""
 "чье имя указано в User ID ключа?\n"
 "  Если Вы не знаете что ответить, введите \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Не буду отвечать.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Я не проверял совсем.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Я проверил частично.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Я проверил очень тщательно.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ваше решение? (введите '?' для получения информации)"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2913,74 +3289,74 @@ msgstr ""
 "Вы уверены, что хотите подписать этот ключ\n"
 "своим ключом: \"%s\" (%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr "Это будет самоподпись.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Подпись будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr "Я совсем не проверял этот ключ.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr "Я проверил этот ключ только частично.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr "Я очень тщательно проверил этот ключ.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Не могу редактировать данный ключ: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2988,11 +3364,11 @@ msgstr ""
 "Введите новый пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3000,186 +3376,186 @@ msgstr ""
 "Вы не хотите задать пароль? Это очень ПЛОХАЯ идея!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 msgid "Do you really want to do this? (y/N) "
 msgstr "Вы действительно хотите сделать это? (y/N)"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "перемещение подписи ключа в правильное место\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "вывести список ключей и User ID"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 msgid "check signatures"
 msgstr "проверка подписей"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "подписать выбранные User ID [* описание соотв. команд см. ниже]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 msgid "sign selected user IDs locally"
 msgstr "локально подписать выбранные User ID"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "sign selected user IDs with a trust signature"
 msgstr "подписать выбранные User ID - trust подписью"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подписать выбранные User ID без возможности отзыва"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 msgid "delete selected user IDs"
 msgstr "удалить выбранные User ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на карту"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подписи у выбранных User ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "сменить срок действительности ключа или выбранных подключей"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранные User ID как главные"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 msgid "toggle between the secret and public key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 msgid "set preference list for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "установить URL предпочитаемого сервера ключей для выбранных User ID"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "сменить пароль"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подписи у выбранных User ID"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 msgid "revoke selected user IDs"
 msgstr "отзыв выбранных User ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 msgid "revoke key or selected subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 msgid "enable key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr "показать выбранные фото ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ошибка чтения секретного блока ключа \"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3191,157 +3567,157 @@ msgstr ""
 "  `t' - trust подпись (tsign), `nr' - без возможности отзыва\n"
 "  (nrsign) или любым их сочетанием (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Вы действительно хотите подписать ВСЕ User ID? (y/N)"
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Подсказка: Выберите User IDs для подписи\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "неизвестный тип подписи `%s'\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Вы должны выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Вы не можете удалить последний User ID!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Вы действительно хотите удалить ВСЕ выбранные User IDs? (y/N)"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 msgid "Really remove this user ID? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? (y/N)"
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr "Действительно удалить главный ключ? (y/N)"
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr "Команда ожидает аргумент - имя файла\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Не могу открыть `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Вы действительно хотите удалить выбранные ключи? (y/N)"
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Вы действительно хотите удалить данный ключ? (y/N)"
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? (y/N)"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? (y/N)"
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Вы действительно хотите отозвать ключ целиком? (y/N)"
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N)"
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Вы действительно хотите отозвать данный подключ? (y/N)"
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Невозможно присвоить степень доверия пока используется указанная "
 "пользователем таблица доверий\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 msgid "Set preference list to:\n"
 msgstr "установить предпочтения в:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? (y/N)"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N)"
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N)"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Опции: "
 
 # check it
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3349,71 +3725,71 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3421,18 +3797,18 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "просрочен с"
 
 # check it
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3440,7 +3816,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3449,54 +3825,54 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Вы не можете добавить фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "недопустимый"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" уже очищен\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3505,359 +3881,364 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s не имеет перекрестной сертификации\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Примечание к подписи"
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перезаписать (y/N)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
 # c-format
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "предпочтение `%s' дублируется\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "слишком много предпочтений для шифра\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "слишком много предпочтений для хэш-функций\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "слишком много предпочтений для методов сжатия\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недопустимое вхождение `%s' в строке предпочтений\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "сохраняем самоподпись\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 msgid "Encrypt"
 msgstr ""
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Возможные действия для ключа %s:"
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr "Допустимы действия:"
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Переключить возможность использования для подписи\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Переключить возможность использования для шифрования\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Переключить возможность использования для аутентификации\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (только для шифрования)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключи %s могут иметь длину от %u до %u бит.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вам необходим? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "размер ключей %s должен быть в пределах %u-%u\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрашиваемый размер ключа %u бит\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3873,7 +4254,7 @@ msgstr ""
 "      <n>m = срок действительности n месяцев\n"
 "      <n>y = срок действительности n лет\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3889,38 +4270,38 @@ msgstr ""
 "      <n>m = срок действительности подписи n месяцев\n"
 "      <n>y = срок действительности подписи n лет\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпись действительна до? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 msgid "Key does not expire at all\n"
 msgstr "Ключ не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 msgid "Signature does not expire at all\n"
 msgstr "Подпись не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до: %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3928,11 +4309,11 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, корректно обрабатываются даты до 2106.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3947,44 +4328,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используется таблица символов: `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3995,7 +4376,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
 
@@ -4010,24 +4391,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват�
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1997
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4035,12 +4416,12 @@ msgstr ""
 "Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4052,7 +4433,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4064,50 +4445,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4115,50 +4496,50 @@ msgstr ""
 "Учтите, что данный ключ не может использоваться для шифрования.  Вы можете\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, 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:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, 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:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "ПРЕДУПРЕЖДАЮ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕТЬТЕ: архивная копия ключа на карте сохранена в `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "неогранич "
 
@@ -4187,626 +4568,599 @@ msgstr "Примечание к подписи"
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 msgid "      Key fingerprint ="
 msgstr "Отпечаток ключа ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "при переименовании `%s' в `%s' произошел сбой: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ВНИМАНИЕ: Существуют 2 файла с конфиденциальной информацией.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s осталось без изменений\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s новых\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Исправьте эту прореху безопасности\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "кеширую связки ключей `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ключей закешировано за это время (%lu подписей)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ключей закешированно (%lu подписей)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: таблица ключей создана\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ВНИМАНИЕ: параметр сервера ключей `%s' не используется на данной платформе\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Введите число(а), N) Следующий или Q) Выход> "
 
 # test it
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" не найден на сервере ключей\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на сервере ключей\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрашиваю ключ %s с %s сервера %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s с %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "отправляю ключ %s на %s сервер %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
 # test it
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 msgid "no keyserver action!\n"
 msgstr ""
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "Данная сборка не поддерживает внешние вызовы для сервера ключей.\n"
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "нет обработчика для схемы сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "действие `%s' не поддерживается серверами ключей `%s'\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s не поддерживает версию обработчика %d\n"
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 msgid "keyserver timed out\n"
 msgstr "превышено время ожидания сервера ключей\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ошибка связи с сервером ключей: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "обновление 1 ключа из %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "сеансовый ключ зашифрован %s \n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "пароль создан с незнакомой хеш-фкнкцией %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: правильный DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s, с ID %s, созданным %s\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с ID %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифрования с открытым ключом: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано с %lu паролями\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано с 1 паролем\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "принятие %s зашифрованных данных\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробуйте использовать взамен %s\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "Расшифровано\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ВНИМАНИЕ: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ВНИМАНИЕ: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАМЕТЬТЕ: отправитель требует \"только для просмотра Вами\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "оригинальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать эти множественные подписи\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись создана %s ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Ключ доступен на:"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись от  \"%s\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "не могу отключить создание файла копии образа памяти: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм %s шифрования с открытым "
 "ключом\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм симметричного шифрования %"
 "s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ВНИМАНИЕ: используется экспериментальная хеш-функция %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "модуль поддержки шифра IDEA не обнаружен\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "Для дополнительной информации см. http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте \"%s%s\" взамен\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "ВНИМАНИЕ: команда \"%s\" является устаревшей - не следует применять ее\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Без сжатия"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1106
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Файл `%s' существует. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 msgid "Overwrite? (y/N) "
 msgstr "Перезаписать (y/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: неизвестное окончание\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Введите новое имя файла"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "Вывод в stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "принятие подписанных данных в `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "создан новый файл настроек `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны при этом запуске\n"
 
-#: g10/openfile.c:424
-#, c-format
-msgid "directory `%s' created\n"
-msgstr "создан каталог `%s'\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ВНИМАНИЕ: потенциально небезопасный сеансовый ключ, зашифрованный "
 "симметричным шифром\n"
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent недоступен в данной сессии\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "протокол gpg-agent версии %d не поддерживается\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "не могу подключиться к `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "проблема с агентом - использование агента отключено\n"
@@ -4868,7 +5222,7 @@ msgstr "         (подключ на главном ключе %s)"
 msgid "Repeat passphrase: "
 msgstr "Повторите пароль: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4882,38 +5236,34 @@ msgstr ""
 "с Вашим открытым ключом и увеличит его размер, т.е. не следует брать очень\n"
 "большое изображение. Рекомендуемый размер около 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Введите имя JPEG файла для Фото ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Не могу открыть JPEG файл `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Этот JPEG очень велик (%d байт)!\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' - не JPEG файл\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Данное фото правильное (y/N/q)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "не могу отобразить Фото ID!\n"
 
@@ -5192,62 +5542,57 @@ msgstr "нет действительных адресов\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "ошибка создания `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Отделенная подпись.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Введите имя файла с данными: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "читаю stdin ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "не подписанные данные\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "анонимный получатель; пробую секретный ключ %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Отлично, мы анонимный получатель.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "старое шифрование DEK не поддерживается\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "алгоритм шифрования %d%s неизвестен или отключен\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "ВНИМАНИЕ: алгоритм шифрования %s не найден в списке предпочтений получателя\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "ЗАМЕТЬТЕ: секретный ключ %s просрочен с %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "ЗАМЕТЬТЕ: ключ был отозван"
 
@@ -5368,90 +5713,90 @@ msgstr "(Пояснения отсутствуют)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Все правильно? (y/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "секретная часть ключ не доступна\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "метод защиты %d%s не поддерживается\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "метод защиты %d не поддерживается\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Неверный пароль; попробуйте еще раз"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ВНИМАНИЕ: обнаружен слабый ключ - смените пароль еще раз.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "создание нерекомендуемой 16-битной контрольной суммы для защиты ключа\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "создан слабый ключ - повторение\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "невозможно избежать слабого ключа для симметричного шифра; %d попыток!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ВНИМАНИЕ: конфликт хэшей подписей в сообщении\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s не имеет перекрестной сертификации\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s имеет недостоверную перекрестную "
 "сертификацию\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "открытый ключ %s на %lu секунд моложе подписи\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "открытый ключ %s на %lu секунд моложе подписи\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5459,7 +5804,7 @@ msgstr ""
 "ключ %s был создан на %lu секунд в будущем (time warp или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5467,49 +5812,49 @@ msgstr ""
 "ключ %s был создан на %lu секунд в будущем (time warp или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "ЗАМЕТЬТЕ: подписавший ключ %s - просрочен %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "принята плохая подпись ключа %s с неизвестным критическим битом\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "ключ %s: нет подключа для подключа отзывающей подписи\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: нет подключа для подписи связи подключей\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "невозможно добавить примечение в v3 (PGP 2.x стиля) подпись\n"
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "невозможно добавить примечание в v3 (PGP 2.x стиля) подпись ключа\n"
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% запись (длинный). Использую неразвернутым.\n"
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5517,7 +5862,7 @@ msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% url правил (длинный). Использую "
 "неразвернутым.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5536,11 +5881,11 @@ msgstr "сбой проверки созданной подписи: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5548,39 +5893,39 @@ msgstr ""
 "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "ключ не помечен как ненадежный - не могу использовать его с ненадёжным RNG!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "пропущено \"%s\": дубликат\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено \"%s\": %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "пропущено: секретный ключ уже имеется\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "это созданный PGP ElGamal ключ, не обеспечивающий безопасность подписи!"
@@ -5635,51 +5980,51 @@ msgstr "ошибка чтения в `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "trustdb транзакция слишком длинная\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "нет доступа к `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталог не существует!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "невозможно создать блокировку для `%s'\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "невозможно заблокировать `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: сбой создания записи о версии: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: создана недействительная таблица доверий\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: создана таблица доверий\n"
@@ -5688,78 +6033,78 @@ msgstr "%s: создана таблица доверий\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "ЗАМЕТЬТЕ: таблица доверий доступна только для чтения\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: недействительная таблица доверий\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: сбой создания таблицы хэшей: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ошибка обновления записи о версии: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ошибка чтения записи о версии: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ошибка сохранения записи о версии: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не является файлом таблицы доверий\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запись о версии с номером записи %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: неправильная версия файла %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ошибка чтения свободной записи: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ошибка внесения записи каталога: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: сбой обнуления записи: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: сбой добавления записи: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
 
@@ -5768,7 +6113,7 @@ msgstr "таблица доверий повреждена; запустите \
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "не могу обработать строки текста длиннее %d символов\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "строка ввода длиннее %d символов\n"
@@ -5940,7 +6285,7 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "невозможно обновить запись о версии таблицы доверий: ошибка записи: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5950,341 +6295,1628 @@ msgstr ""
 "Файл подписи (.sig или .asc) должен быть\n"
 "первым указан в командной строке.\n"
 
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "входная строка %u слишком длинная или пропущен LF\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "глобальная ошибка"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "Вы нашли ошибку ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "неизвестный тип пакета"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "неизвестная версия"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "не удалось подписать: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "неизвестный алгоритм с открытым ключом"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "при переименовании `%s' в `%s' произошел сбой: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "неизвестная хэш-функция"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "неправильный открытый ключ"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "неправильный секретный ключ"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "подпись неверна"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "несоответствие контрольной сумме"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "неправильный пароль"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "открытый ключ не найден"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "неизвестный алгоритм шифрования"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "сбой сохранения отпечатка: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "не могу открыть таблицу ключей"
+#: scd/app-openpgp.c:609
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "сбой сохранения даты создания: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "неправильный пакет"
+#: scd/app-openpgp.c:1004
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "сбой при чтении ключа: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "неправильный ASCII формат"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr "ответ не содержит данных открытого ключа\n"
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "нет такого User ID"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr "в ответе отсутствует модуль RSA\n"
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "секретный ключ не найден"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "использован неправильный секретный ключ"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "не поддерживается"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "неправильный ключ"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "при проверке CHV%d сбой: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "ошибка чтения файла"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr "доступ к командам управления не настроен\n"
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "ошибка записи файла"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr "ошибка получения статуса CHV с карты\n"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "неизвестный алгоритм сжатия"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr "карта заблокирована!\n"
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "ошибка открытия файла"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+"осталось %d попыток ввода административного PIN перед блокировкой карты\n"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "ошибка создания файла"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr "|A|Административный PID"
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "неправильный пароль"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr "|AN|Новый административный PIN"
+
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr "|N|Новый PIN"
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "нереализованный алгоритм с открытым ключом"
+#: scd/app-openpgp.c:1535
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "ошибка при получении нового PIN: %s\n"
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "нереализованный алгоритм шифрования"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+msgid "error reading application data\n"
+msgstr "ошибка чтения данных приложения\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "неизвестный класс подписи"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+msgid "error reading fingerprint DO\n"
+msgstr "ошибка чтения отпечатка DO\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "ошибка в таблице доверий"
+#: scd/app-openpgp.c:1601
+msgid "key already exists\n"
+msgstr "ключ уже существует\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "неверный MPI"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr "существующий ключ будет заменен\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "нехватка ресурсов"
+#: scd/app-openpgp.c:1607
+msgid "generating new key\n"
+msgstr "генерация нового ключа\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "неправильная связка ключей"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr "пропущен штамп создания создания\n"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "неправильный сертификат"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "деформированный User ID"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "ошибка закрытия файла"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "ошибка переименования файла"
+#: scd/app-openpgp.c:1866
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "сбой сохранения ключа: %s\n"
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "ошибка удаления файла"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "неожидавшиеся данные"
+#: scd/app-openpgp.c:1939
+msgid "generating key failed\n"
+msgstr "сбой при генерации ключа\n"
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "конфликт с меткой времени"
+#: scd/app-openpgp.c:1942
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "неприменимый алгоритм открытого ключа"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "файл существует"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s подпись, хэш-функция %s\n"
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "слабый ключ"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "подписей создано: %lu\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "недопустимый аргумент"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "плохой URI"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"проверка административного PIN в данный момент запрещен этой командой\n"
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "неподдерживаемый URI"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "ошибка сети"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "не зашифровано"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "параметры конфигурации взяты из файла `%s'\n"
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "не выполнено"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "непригодный открытый ключ"
+#: scd/scdaemon.c:122
+msgid "|NAME|use NAME as ct-API driver"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "непригодный закрытый ключ"
+#: scd/scdaemon.c:123
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr ""
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "ошибка сервера ключей"
+#: scd/scdaemon.c:126
+msgid "do not use the internal CCID driver"
+msgstr ""
 
-#: util/errors.c:109
-msgid "canceled"
-msgstr "отменено"
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
-msgid "no card"
-msgstr "нет карты"
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "показать управляющие команды"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "не подписанные данные\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: util/logger.c:158
-msgid "ERROR: "
-msgstr "ОШИБКА:"
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
-msgstr "ВНИМАНИЕ:"
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr " ... это ошибка (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "Вы нашли ошибку ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "да"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "недопустимый символ radix64 %02X пропущен\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "yY"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "протокол gpg-agent версии %d не поддерживается\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "протокол gpg-agent версии %d не поддерживается\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "Не могу открыть `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "экспорт секретных ключей не разрешен\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "сбой сохранения ключа: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "ЗАМЕТЬТЕ: ключ был отозван"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "неправильный сертификат"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Ключ доступен на:"
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "сбой проверки созданной подписи: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "создать сертификат отзыва"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Данный ключ просрочен!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "отпечаток CA: "
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "сбой проверки созданной подписи: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "проверить подпись"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA требует использования 160 битной хэш-функции\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "нет"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "[не установлено]"
+
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "Ошибка: недопустимый ответ.\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "Ошибка: недопустимый ответ.\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"Необходим пароль для доступа к секретному ключу пользователя:\n"
+"\"%.*s\"\n"
+"%u-бит %s ключ, ID %s, создан %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "ошибка при считывании информации ключа: %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "недопустимая хэш-функция `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Неправильный e-mail адрес\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "ошибка создания таблицы ключей `%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Сбой при создании ключа: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "секретный ключ \"%s\" не найден: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "ошибка чтения блока ключей: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "Сертификат отзыва создан.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "предпочтение `%s' дублируется\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "сбой при удалении блока ключа: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(Пояснения отсутствуют)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: ошибка внесения записи каталога: %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[file]|создать подпись к файлу"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[file]|создать прозрачную подпись к файлу"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "вывести список секретных ключей"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "неправильный сертификат"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "удалить ключи из таблицы открытых ключей"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "неправильный сертификат"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "неправильный сертификат"
+
+#: sm/gpgsm.c:263
+#, fuzzy
+msgid "register a smartcard"
+msgstr "добавить ключ на карту"
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "сменить пароль"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "вывод в ASCII формате"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr ""
+
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "use the default key as default recipient"
+msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "force v3 signatures"
+msgstr "проверка подписей"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr ""
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr ""
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:351
+#, fuzzy
+msgid "add this keyring to the list of keyrings"
+msgstr "используются ключи из этой таблицы ключей"
+
+#: sm/gpgsm.c:352
+#, fuzzy
+msgid "add this secret keyring to the list"
+msgstr "Для данного действия нужен секретный ключ.\n"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr ""
+
+#: sm/gpgsm.c:355
+#, fuzzy
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NAME|зашифровать для получателя NAME"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr ""
+
+#: sm/gpgsm.c:380
+#, fuzzy
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "неизвестный алгоритм шифрования"
+
+#: sm/gpgsm.c:382
+#, fuzzy
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "%s подпись, хэш-функция %s\n"
+
+#: sm/gpgsm.c:384
+#, fuzzy
+msgid "|N|use compress algorithm N"
+msgstr "неизвестный алгоритм сжатия"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Синтаксис: gpg [параметры] [файлы]\n"
+"подписать и проверить, зашифровать или расшифровать\n"
+"операция по умолчанию зависит от входных данных\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "использование: gpg [опции] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "не могу подключиться к `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "нет доступа к `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Всего обработано: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "создать сертификат отзыва"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "ошибка чтения `%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "ошибка создания таблицы ключей `%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "создана таблица ключей `%s'\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "сбой сохранения отпечатка: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "сбой сохранения ключа: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "ошибка при поиске записи о доверии в `%s': %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "ошибка при считывании информации ключа: %s\n"
+
+#: sm/keydb.c:1392
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "ошибка при получении нового PIN: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "ошибка чтения `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "Ошибка: неправильный формат отпечатка.\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "сбой проверки созданной подписи: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Подпись сделана %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Действительная подпись от \"%s\""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                aka \"%s\""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "quit"
 
-#: util/miscutil.c:374
-msgid "qQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
-msgid "cC"
+#: tools/gpg-connect-agent.c:126
+#, fuzzy
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "ВНИМАНИЕ: используется незащищенная память!\n"
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "Для дополнительной информации см. http://www.gnupg.org/faq.html\n"
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "строка слишком длинная"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "неизвестный параметр `%s'\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "не удалось подписать: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "сбой при чтении ключа: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "ошибка чтения `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "ошибка при поиске записи о доверии в `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "использование: gpg [опции] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "открытый ключ не найден"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "ошибка создания таблицы ключей `%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Команды:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "Расшифровано\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "Расшифровано\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [filename]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s не допускается использовать с %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "%s не допускается использовать с %s!\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "не могу создать каталог `%s': %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "ошибка записи таблицы ключей `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "ошибка чтения `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "ошибка в `%s': %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "удаленный запуск программы не поддерживается\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "не могу создать `%s': %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "не могу создать `%s': %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "сбой при обновлении: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "сбой при удалении блока ключа: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "сбой при обновлении: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "сбой при обновлении: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "сбой при обновлении: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "не могу создать резервную копию, файл `%s': %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "операция невозможна без инициализации защищенной памяти\n"
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
 msgstr ""
-"(возможно, Вы используете неподходящее программное обеспечение\n"
-"для данной задачи)\n"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA требует использования 160 битной хэш-функции\n"
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "метод защиты %d не поддерживается\n"
+
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "не могу сгенерировать простое число с pbits=%u qbits=%u\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "не могу сгенерировать простое число меньше чем с %d битами\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "не найден модуль накопления энтропии\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "невозможно заблокировать `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "сохранение секретного ключа в `%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "не могу выполнить stat `%s': %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' не регулярный файл - проигнорирован\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "замечание: файл random_seed пуст\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "ВНИМАНИЕ: недопустимый размер файла random_seed - не использую\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "не могу прочитать `%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "замечание: файл random_seed не обновлен\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "не могу записать `%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "не могу закрыть `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "ВНИМАНИЕ: используется небезопасный генератор случайных чисел!!\n"
 
 #~ 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"
+#~ "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"
+
+#~ 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"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "секретный ключ не найден"
+
+#~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
+#~ msgstr "Вставьте карту и нажмите Enter или введите 'c' для отмены: "
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "Please remove the current card and insert the one with serial number:\n"
+#~ "   %.*s\n"
 #~ msgstr ""
-#~ "имя примечания должно содержать только печатные символы или пробелы,и "
-#~ "заканчиваться знаком '='\n"
+#~ "Извлеките текущую карту и вставьте карту с серийным номером:\n"
+#~ "   %.*s\n"
+
+#~ msgid "Hit return when ready or enter 'c' to cancel: "
+#~ msgstr "Нажмите Enter, когда будете готовы или введите 'c' для отмены: "
+
+#~ msgid "Enter New Admin PIN: "
+#~ msgstr "Введите новый Admin PIN: "
+
+#~ msgid "Enter New PIN: "
+#~ msgstr "Введите новый PIN: "
+
+#~ msgid "Enter Admin PIN: "
+#~ msgstr "Введите Admin PIN: "
+
+#~ msgid "Enter PIN: "
+#~ msgstr "Введите PIN: "
+
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "ПРЕДУПРЕЖДАЮ: %s недоступен в данной версии\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "алгоритмы для этих User ID:\n"
+
+#~ msgid "general error"
+#~ msgstr "глобальная ошибка"
+
+#~ msgid "unknown packet type"
+#~ msgstr "неизвестный тип пакета"
+
+#~ msgid "unknown version"
+#~ msgstr "неизвестная версия"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "неизвестный алгоритм с открытым ключом"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "неизвестная хэш-функция"
+
+#~ msgid "bad public key"
+#~ msgstr "неправильный открытый ключ"
+
+#~ msgid "bad secret key"
+#~ msgstr "неправильный секретный ключ"
+
+#~ msgid "bad signature"
+#~ msgstr "подпись неверна"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "имя примечания пользователя должно содержать '@' символ\n"
+#~ msgid "checksum error"
+#~ msgstr "несоответствие контрольной сумме"
 
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "имя пользователя не должно содержать более одного символа '@'\n"
+#~ msgid "can't open the keyring"
+#~ msgstr "не могу открыть таблицу ключей"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "значение примечания не должно содержать управляющие символы\n"
+#~ msgid "invalid packet"
+#~ msgstr "неправильный пакет"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "ВНИМАНИЕ: найдена недопустимая форма записи данных\n"
+#~ msgid "invalid armor"
+#~ msgstr "неправильный ASCII формат"
 
-#~ msgid "not human readable"
-#~ msgstr "нечитаемо для человека"
+#~ msgid "no such user id"
+#~ msgstr "нет такого User ID"
+
+#~ msgid "secret key not available"
+#~ msgstr "секретный ключ не найден"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "использован неправильный секретный ключ"
+
+#~ msgid "not supported"
+#~ msgstr "не поддерживается"
+
+#~ msgid "bad key"
+#~ msgstr "неправильный ключ"
+
+#~ msgid "file read error"
+#~ msgstr "ошибка чтения файла"
+
+#~ msgid "file write error"
+#~ msgstr "ошибка записи файла"
+
+#~ msgid "file open error"
+#~ msgstr "ошибка открытия файла"
+
+#~ msgid "file create error"
+#~ msgstr "ошибка создания файла"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "неправильный пароль"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "нереализованный алгоритм с открытым ключом"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "нереализованный алгоритм шифрования"
+
+#~ msgid "unknown signature class"
+#~ msgstr "неизвестный класс подписи"
+
+#~ msgid "trust database error"
+#~ msgstr "ошибка в таблице доверий"
+
+#~ msgid "resource limit"
+#~ msgstr "нехватка ресурсов"
+
+#~ msgid "invalid keyring"
+#~ msgstr "неправильная связка ключей"
+
+#~ msgid "malformed user id"
+#~ msgstr "деформированный User ID"
+
+#~ msgid "file close error"
+#~ msgstr "ошибка закрытия файла"
+
+#~ msgid "file rename error"
+#~ msgstr "ошибка переименования файла"
+
+#~ msgid "file delete error"
+#~ msgstr "ошибка удаления файла"
+
+#~ msgid "unexpected data"
+#~ msgstr "неожидавшиеся данные"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "конфликт с меткой времени"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "неприменимый алгоритм открытого ключа"
+
+#~ msgid "file exists"
+#~ msgstr "файл существует"
+
+#~ msgid "weak key"
+#~ msgstr "слабый ключ"
+
+#~ msgid "invalid argument"
+#~ msgstr "недопустимый аргумент"
+
+#~ msgid "bad URI"
+#~ msgstr "плохой URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "неподдерживаемый URI"
+
+#~ msgid "network error"
+#~ msgstr "ошибка сети"
+
+#~ msgid "not encrypted"
+#~ msgstr "не зашифровано"
+
+#~ msgid "not processed"
+#~ msgstr "не выполнено"
+
+#~ msgid "unusable public key"
+#~ msgstr "непригодный открытый ключ"
+
+#~ msgid "unusable secret key"
+#~ msgstr "непригодный закрытый ключ"
+
+#~ msgid "keyserver error"
+#~ msgstr "ошибка сервера ключей"
+
+#~ msgid "no card"
+#~ msgstr "нет карты"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "не подписанные данные\n"
+
+#~ msgid "ERROR: "
+#~ msgstr "ОШИБКА:"
+
+#~ msgid "WARNING: "
+#~ msgstr "ВНИМАНИЕ:"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr " ... это ошибка (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "ВНИМАНИЕ: используется незащищенная память!\n"
+
+#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#~ msgstr "Для дополнительной информации см. http://www.gnupg.org/faq.html\n"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "операция невозможна без инициализации защищенной памяти\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr ""
+#~ "(возможно, Вы используете неподходящее программное обеспечение\n"
+#~ "для данной задачи)\n"
+
+#~ 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"
 
 #~ msgid "expired: %s)"
 #~ msgstr "просрочен с: %s)"
diff --git a/po/sk.po b/po/sk.po
index b72084f1b..b5b46f20f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+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"
@@ -13,296 +13,724 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: agent/call-pinentry.c:193
 #, 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"
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: cipher/primegen.c:312
-#, 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"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "nemo�no otvori� `%s'\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "riadok je pr�li� dlh�\n"
+
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "heslo je pr�li� dlh�\n"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Neplatn� znak ve mene\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "nespr�vne MPI"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "nespr�vne heslo"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "nespr�vne heslo"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "zapisujem tajn� k��� do `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "nem��em vytvori� `%s': %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "nem��em pou�i� pr�kaz stat na `%s': %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' nie je norm�lny s�bor - ignorovan�\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "pozn�mka: s�bor random_seed je pr�zdny\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "nem��em ��ta� `%s': %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "nem��em vytvori� `%s': %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "nem��em zapisova� do `%s': %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "nem��em zavrie� `%s': %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "VAROVANIE: pou�it� gener�tor n�hodn�ch ��sel nie je bezpe�n�!!\n"
+#: agent/divert-scd.c:217
+msgid "Admin PIN"
+msgstr ""
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Opakujte heslo: "
+
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
+
+#: agent/divert-scd.c:290
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
 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"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: cipher/rndegd.c:202
-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"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "zmeni� heslo"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 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/rndlinux.c:132
-#, c-format
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "zmeni� heslo"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\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"
+"@\n"
+"Mo�nosti:\n"
+" "
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "nem��em inicializova� datab�zu d�very: %s\n"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "s dodato�n�mi inform�ciami"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "by� o trochu tich��"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "vyh�ada� k���e na serveri k���ov"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "aktualizova� datab�zu d�very"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr ""
+"Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
+"Pripomienky k prekladu <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "nepodarilo posla� k��� na server: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "s�bor s mo�nos�ami `%s': %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "��tam mo�nosti z `%s'\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "chyba pri vytv�ran� `%s': %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "nem��em vytvori� adres�r `%s': %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "%s: nem��em vytvori�: %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "chyba pri posielan� na `%s': %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "aktualiz�cia zlyhala: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "zapisujem tajn� k��� do `%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: adres�r vytvoren�\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: nem��em vytvori� adres�r: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "chyba pri vytv�ran� hesla: %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: presko�en�: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "chyba pri ��tan� bloku k���a: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' je u� skomprimovan�\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "vytvori� nov� p�r k���ov"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "nespr�vne heslo"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "Zru�i�"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "k��� `%s' nebol n�jden�: %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "tajn� �asti k���a nie s� dostupn�\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "chyba pri ��tan�: %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "nem��em inicializova� datab�zu d�very: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+msgid "Yes"
+msgstr "ano"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "nemo�no otvori� s�bor: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s podpis, hashovac� algoritmus %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "chyba pri vytv�ran� `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[User id not found]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "nem��em sa pripoji� k `%s': %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "probl�m v komunik�cii s gpg-agentom\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "probl�m s agentom: agent vracia 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "zru�en� u��vate�om\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "probl�m s agentom: agent vracia 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "nem��em vypn�� vytv�ranie core s�borov: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "ano"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "aAyY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "nie"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "ukon�i�"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "uUqQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
+#: common/yesno.c:114
+msgid "oO"
+msgstr ""
+
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: g10/armor.c:320
 #, c-format
@@ -381,176 +809,213 @@ msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dovan� - pravdepodobne bol "
 "pou�it� nespr�vny MTA\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+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/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "hodnota mus� obsahova� znak '@'\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "hodnota mus� obsahova� znak '@'\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "nie je v priamo �itate�nom form�te"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajn� k��� nie je dostupn�"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "nespracovan�"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -558,207 +1023,155 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "tajn� k��� nie je dostupn�"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr ""
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr ""
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Opakujte heslo: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output pre tento pr�kaz nefunguje\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -801,52 +1214,52 @@ msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 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/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 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:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "pou�it� �ifra %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "��tam z `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: 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:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -854,172 +1267,208 @@ msgid ""
 msgstr ""
 "vy�iadan� kompresn� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, 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:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, 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/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pre: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� d�ta\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 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:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m so za�ifrovan�m paketom\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "nem��em vytvori� adres�r `%s': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "t�to platforma potrebuje do�asn� s�bory na spustenie extern�ho programu\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nemo�no spusti� %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nemo�no spusti� %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "nekorektn� ukon�enie extern�ho programu\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "nemo�no spusti� extern� program\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, 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:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, 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/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "nepou�ite�n� tajn� k���"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, 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:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, 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:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+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:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[User id not found]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+# c-format
+#: g10/getkey.c:1827
+#, 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:2381 g10/keyedit.c:3708
+#, 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:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
+
+#: g10/getkey.c:2659
+#, 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/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1027,128 +1476,129 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1158,55 +1608,51 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 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/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "s dodato�n�mi inform�ciami"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1215,7 +1661,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1235,17 +1681,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 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/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1255,7 +1701,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1263,648 +1709,587 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, 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/gpg.c:1270
+#: g10/gpg.c:1286
 #, 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/gpg.c:1273
+#: g10/gpg.c:1289
 #, 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/gpg.c:1279
+#: g10/gpg.c:1295
 #, 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/gpg.c:1282
+#: g10/gpg.c:1298
 #, 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/gpg.c:1285
+#: g10/gpg.c:1301
 #, 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/gpg.c:1291
+#: g10/gpg.c:1307
 #, 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/gpg.c:1294
+#: g10/gpg.c:1310
 #, 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/gpg.c:1297
+#: g10/gpg.c:1313
 #, 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/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, 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/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "s�bor s mo�nos�ami `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "��tam mo�nosti z `%s'\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, 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/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 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/gpg.c:2861
+#: g10/gpg.c:2886
 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/gpg.c:2867
+#: g10/gpg.c:2892
 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/gpg.c:2880
+#: g10/gpg.c:2905
 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/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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/gpg.c:2986
+#: g10/gpg.c:3010
 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/gpg.c:2988
+#: g10/gpg.c:3012
 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/gpg.c:2991
+#: g10/gpg.c:3015
 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/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, fuzzy, 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/gpg.c:3104
+#: g10/gpg.c:3128
 #, fuzzy, 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/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, 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/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 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/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, 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/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, 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/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 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/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/getkey.c:152
-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:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[User id not found]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-# c-format
-#: g10/getkey.c:1826
-#, 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:2380 g10/keyedit.c:3707
-#, 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:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
-
-#: g10/getkey.c:2658
-#, 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/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "by� o trochu tich��"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1912,7 +2297,7 @@ msgstr ""
 "Syntax: gpg [nastavenia] [s�bory]\n"
 "Skontroluje podpisy oproti zn�mym d�veryhodn�m k���om\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1923,7 +2308,7 @@ msgstr ""
 "d�very\"; nem� to ni� spolo�n� s (implicitne vytvorenou) \"pavu�inou\n"
 "certifik�tov\"."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1935,17 +2320,17 @@ msgstr ""
 "k tajn�m k���om. Odpovedzte \"ano\", aby ste nastavili tieto k���e\n"
 "ako absol�tne d�veryhodn�\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1959,7 +2344,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1970,16 +2355,16 @@ msgstr ""
 "Tento algoritmus je vhodn� pou�i� len za ur�it�ch podmienok.\n"
 "Kontaktujte pros�m najprv bezpe�nostn�ho �pecialistu."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Vlo�te d�ku k���a"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpovedzte \"ano\" alebo \"nie\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1991,19 +2376,19 @@ msgstr ""
 "spr�vnu chybov� hl�ku - miesto toho syst�m sk�si interpretova�\n"
 "zadan� hodnotu ako interval."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Vlo�te meno dr�ite�a k���a"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 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:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Pros�m, vlo�te nepovinn� koment�r"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2017,11 +2402,11 @@ msgstr ""
 "O  pre pokra�ovanie generovania k���a.\n"
 "Q  pre ukon�enie generovania k���a."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2095,13 +2480,13 @@ msgstr ""
 "\n"
 "Pokia� neviete, ak� je spr�vna odpove�, odpovedzte \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if 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:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2110,11 +2495,11 @@ msgstr ""
 "\".\n"
 "V�etky certifik�ty bud� tie� straten�!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Odpovedzte \"ano\", pokia� chcete zmaza� podk���"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2124,7 +2509,7 @@ msgstr ""
 "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:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2136,13 +2521,13 @@ msgstr ""
 "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:211
+#: g10/helptext.c:213
 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:215
+#: g10/helptext.c:217
 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"
@@ -2155,7 +2540,7 @@ msgstr ""
 "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:223
+#: g10/helptext.c:225
 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"
@@ -2165,24 +2550,24 @@ msgstr ""
 "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:230
+#: g10/helptext.c:232
 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:236
+#: g10/helptext.c:238
 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:240
+#: g10/helptext.c:242
 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:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Ak si prajete prep�sanie s�boru, odpovedzte \"ano\""
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2190,7 +2575,7 @@ 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:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2218,7 +2603,7 @@ msgstr ""
 "      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:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2228,11 +2613,11 @@ msgstr ""
 "ceritifik�tu. Pros�m, stru�ne. \n"
 "Text kon�� pr�zdnym riadkom.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Pomoc nie je k dispoz�cii"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc nie je dostupn� pre '%s'"
@@ -2268,501 +2653,496 @@ msgstr "nepou�ite�n� tajn� k���"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d bol presko�en�\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu k���e boli doteraz spracovan�\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkovo spracovan�ch k���ov: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      presko�en� nov� k���e: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        bez identifik�torov: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importovan�: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  bez zmien: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� id u��vate�ov: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              nov� podk���e: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      nov� revok�cie k���ov: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importovan� tajn� k���e: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      tajn� k���e nezmenen�: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportovan�: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, 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:764
+#: g10/import.c:763
 #, 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:770
+#: g10/import.c:769
 #, 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:772
+#: g10/import.c:771
 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:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, 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:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, 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:914
+#: g10/import.c:913
 #, 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:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, 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:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, 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:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, 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:1203
+#: g10/import.c:1202
 #, 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:1233
+#: g10/import.c:1232
 #, 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:1276
+#: g10/import.c:1275
 #, 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:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, 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:1389
+#: g10/import.c:1388
 #, 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:1391
+#: g10/import.c:1390
 #, 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:1409
+#: g10/import.c:1408
 #, 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:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, 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:1459
+#: g10/import.c:1458
 #, 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:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, 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:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, 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:1604
+#: g10/import.c:1603
 #, 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:1618
+#: g10/import.c:1617
 #, 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:1626
+#: g10/import.c:1625
 #, 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:1726
+#: g10/import.c:1725
 #, 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:1788
+#: g10/import.c:1787
 #, 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:1802
+#: g10/import.c:1801
 #, 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:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, 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/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, 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:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[revok�cia]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[podpis k���a n�m sam�m]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 zl� podpis\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d zl�ch podpisov\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, 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:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 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:359
+#: g10/keyedit.c:360
 #, 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:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2775,63 +3155,63 @@ msgstr ""
 "kontrolou fingerprintov z r�znych zdrojov...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�verujem �iasto�ne\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�verujem �plne\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 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:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, 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:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2840,11 +3220,11 @@ msgstr ""
 "Podpis k���a \"%s\" n�m sam�m je\n"
 "podpis vo form�te PGP 2.x.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 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:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2854,11 +3234,11 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2868,54 +3248,54 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 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:780
+#: g10/keyedit.c:781
 #, 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:783
+#: g10/keyedit.c:784
 #, 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:788
+#: g10/keyedit.c:789
 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:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ni� na podp�sanie k���om %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnos� k���a vypr�� %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 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:891
+#: g10/keyedit.c:892
 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:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2925,32 +3305,32 @@ msgstr ""
 "patr� vy��ie uvedenej osobe?\n"
 "Pokia� nepozn�te odpove�, zadajte \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, 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:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) �iasto�ne som to overil(a).%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, 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:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "V� v�ber? ('?' - viac inform�ci�): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2959,28 +3339,28 @@ msgstr ""
 "Ste si ist�, �e chcete podp�sa� tento k���\n"
 "svoj�m k���om: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "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:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "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:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -2988,72 +3368,72 @@ msgstr ""
 "Podpis bude ozna�en� ako neexportovate�n�.\n"
 "\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "V�bec som tento k��� neoveril.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "�iasto�ne som overil tento k���.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Velmi d�kladne som overil tento k���.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nie je mo�n� editova� tento k���: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3061,11 +3441,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3073,206 +3453,206 @@ msgstr ""
 "Nechcete heslo - to je *zl�* n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "nastavi� k��� ako neplatn� (disable)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, 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:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Tajn� k��� je dostupn�.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3280,241 +3660,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "K��� revokovan�."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�ma trieda podpisu"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, 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:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Not�cie: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3522,19 +3902,19 @@ 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:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3542,7 +3922,7 @@ 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:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3551,55 +3931,55 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 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:3022
+#: g10/keyedit.c:3023
 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:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3608,370 +3988,375 @@ 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:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 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:3412
+#: g10/keyedit.c:3413
 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:3434
+#: g10/keyedit.c:3435
 #, 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:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 #, fuzzy
 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:3520
+#: g10/keyedit.c:3521
 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:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 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:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, 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:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podp�san� %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 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:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, 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:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, 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/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita predvo�by %c%lu\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "zapisujem podpis k���a sebou sam�m\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifrova� d�ta"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ak� ve�kos� k���a si prajete? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3987,7 +4372,7 @@ msgstr ""
 "      <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:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4003,40 +4388,40 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skon�� za n rokov\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4044,12 +4429,12 @@ 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:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4066,44 +4451,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4114,7 +4499,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
 
@@ -4129,23 +4514,23 @@ msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4153,12 +4538,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4170,7 +4555,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4182,50 +4567,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, 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:3047
+#: g10/keygen.c:3228
 #, 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:3065
+#: g10/keygen.c:3246
 #, 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:3072
+#: g10/keygen.c:3253
 #, 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:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4234,12 +4619,12 @@ 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:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4247,7 +4632,7 @@ 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:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4255,31 +4640,31 @@ 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:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 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:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "nikdy     "
 
@@ -4307,634 +4692,607 @@ msgstr "Podpisov� not�cia: "
 msgid "Keyring"
 msgstr "s�bor k���ov (keyring)"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podk���a:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint k���a ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROVANIE: Existuj� dva s�bory s tajn�mi inform�ciami.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je bez zmeny\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, 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:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s k��� �ifrovan�ho sedenia\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejn� k��� je %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrovan� %s k���om, ID %08lX\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrovan� s %lu heslami\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrovan� jedn�m heslom\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "de�ifrovanie o.k.\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� meno s�boru='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 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:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, 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:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 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:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "nem��em vypn�� vytv�ranie core s�borov: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�ifrovac� algoritmus nie je implementovan�"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pre GnuPG nen�jden�\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = pros�m o viac inform�c�i\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "S�bor `%s' existuje. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nezn�ma pr�pona\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Vlo�te nov� n�zov s�boru"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "zapisujem na �tandardn� v�stup (stdout)\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "predpoklad�m podp�san� d�ta v `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "vytvoren� nov� konfigura�n� s�bor `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: adres�r vytvoren�\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, 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:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
-
-#: g10/passphrase.c:345
-#, 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:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "nem��em sa pripoji� k `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentom - pou��vanie agenta vypnut�\n"
@@ -5000,7 +5358,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5015,39 +5373,35 @@ msgstr ""
 "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:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Meno s�bor s fotografiou vo form�te JPEG: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, fuzzy
 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:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" nie je s�bor JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je t�to fotografia spr�vna (a/N/u)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
@@ -5330,61 +5684,56 @@ msgstr "�iadne platn� adresy\n"
 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:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "chyba pri vytv�ran� `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Podpis oddelen� od dokumentu.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "��tam �tandardn� vstup (stdin) ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "ch�baj� podp�san� d�ta\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, 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:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my sme anonymn� adres�t.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "star� k�dovanie DEK nie je podporov�n�\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, 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:282
+#: g10/pubkey-enc.c:285
 #, 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:302
+#: g10/pubkey-enc.c:305
 #, 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:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
@@ -5506,89 +5855,89 @@ msgstr "(�iadny popis)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Je to v poriadku? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "tajn� �asti k���a nie s� dostupn�\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, 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:72
+#: g10/seckey-cert.c:74
 #, 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:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, sk�ste to znovu"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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:366
+#: g10/seckey-cert.c:406
 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/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "vytvoren� slab� k��� - sk��am znovu\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, 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:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROVANIE: konflikt hashu podpisu v spr�ve\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, 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:113
+#: g10/sig-check.c:119
 #, 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:181
+#: g10/sig-check.c:191
 #, 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:182
+#: g10/sig-check.c:192
 #, 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:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5596,7 +5945,7 @@ 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:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5604,52 +5953,52 @@ 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:205
+#: g10/sig-check.c:215
 #, 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:287
+#: g10/sig-check.c:298
 #, 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:544
+#: g10/sig-check.c:560
 #, 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:570
+#: g10/sig-check.c:587
 #, 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
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5657,7 +6006,7 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5676,54 +6025,54 @@ msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: 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:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 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:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "presko�en� `%s': duplikovan�\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "presko�en� `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5785,51 +6134,51 @@ msgstr "chyba pri ��tan�: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, 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:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "transakcia s datab�zou d�very je pr�li� dlh�\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adres�r neexistuje!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodarilo sa vytvori� z�znam verzie: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvoren� neplatn� datab�za d�very\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�za d�very vytvoren�\n"
@@ -5838,78 +6187,78 @@ msgstr "%s: datab�za d�very vytvoren�\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustdb nemo�no zapisova�\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�very\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba pri aktualiz�cii z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba pri ��tan� z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba pri z�pise z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�very: proced�ra lseek() zlyhala: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, 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:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nie je s�bor datab�zy d�very\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verzie s ��slom %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verzia s�boru %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, 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:1419
+#: g10/tdbio.c:1412
 #, 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:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulovanie z�znamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 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"
 
@@ -5918,7 +6267,7 @@ msgstr "datab�za d�very je po�koden�; pros�m spustite \"gpg --fix-trustdb\".\n"
 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:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� riadok je dlh�� ako %d znakov\n"
@@ -6087,7 +6436,7 @@ msgstr ""
 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:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6097,345 +6446,1609 @@ msgstr ""
 "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:192
+#: g10/verify.c:195
 #, 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"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "v�eobecn� chyba"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "n�jden� chyba v programe ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "nezn�my typ paketu"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "nezn�ma verzia"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "nezn�my algoritmus verejn�ho k���a"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "nezn�my hashovac� algoritmus"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "neplatn� verejn� k���"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "neplatn� tajn� k���"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr ""
+"Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
+"Pripomienky k prekladu <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "neplatn� podpis"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "chyba kontroln�ho s��tu"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "nespr�vne heslo"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "verejn� k��� nen�jden�"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "nezn�my �ifrovac� algoritmus"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "nem��em otvori� s�bor k���ov"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "neplatn� paket"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "neplatn� sp�sob reprezent�cie v ASCII"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "u��vate� s t�mto id neexistuje"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "tajn� k��� nie je dostupn�"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "bol pou�it� nespr�vny tajn� k���"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "nepodporovan�"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "nespr�vny k���"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "chyba pri ��tan� s�boru"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "chyba pri z�pise s�boru"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "nezn�my kompresn� algoritmus"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "chyba pri otv�ran� s�boru"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "chyba pri vytv�ran� s�boru"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "nespr�vne heslo"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algoritmus verejn�ho k���a nie je implementovan�"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "�ifrovac� algoritmus nie je implementovan�"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "nezn�ma trieda podpisu"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "chyba v datab�ze d�very"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "nespr�vne MPI"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' je u� skomprimovan�\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "obmedzenie zdrojov"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "neplatn� s�bor k���ov"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "vytvori� nov� p�r k���ov"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "nespr�vny certifik�t"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "nespr�vny form�t id u��vate�a"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "chyba pri zatv�ran� s�boru"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "chyba pri premenov�van� s�boru"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "chyba pri mazan� s�boru"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "neo�ak�van� d�ta"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "konflikt �asov�ho raz�tka"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "nepou�ite�n� algoritmus s verejn�m k���om"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "s�bor existuje"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "slab� k���"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "neplatn� argument"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "nespr�vne URI"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "toto URI nie je podporovan�"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "chyba siete"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, fuzzy, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "neza�ifrovan�"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "nespracovan�"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "��tam mo�nosti z `%s'\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "nepou�ite�n� verejn� k���"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "nepou�ite�n� tajn� k���"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "chyba servera k���ov"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "Zru�i�"
+msgid "do not use the internal CCID driver"
+msgstr "v�bec nepou��va� termin�l"
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "neza�ifrovan�"
+msgid "allow the use of admin card commands"
+msgstr "konfliktn� pr�kazy\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "ch�baj� podp�san� d�ta\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:1008
+#, c-format
+msgid "handler for fd %d started\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... toto je chyba v programe (%s:%d:%s)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
+
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
 
-#: util/logger.c:230
+#: sm/call-dirmngr.c:182
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "n�jden� chyba v programe ... (%s:%d)\n"
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "ano"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "aAyY"
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "nem��em otvori� `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "zapisujem tajn� k��� do `%s'\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "nem��em inicializova� datab�zu d�very: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "POZN�MKA: k��� bol revokovan�"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "nespr�vny certifik�t"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "K��� k dispoz�cii na: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "vytvori� revoka�n� certifik�t"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Platnos� k���a vypr�ala!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "vyp�sa� fingerprint"
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "verifikova� podpis"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "nie"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "nezn�me"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "chyba: neplatn� odtla�ok\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "chyba: neplatn� odtla�ok\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+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"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "neplatn� hashovac� algoritmus `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "Neplatn� e-mailov� adresa\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "k��� `%s' nebol n�jden�: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "chyba pri ��tan� bloku k���a: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "duplicita predvo�by %c%lu\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(�iadny popis)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "zapisujem do '%s'\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[s�bor]|vytvori� podpis"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "vyp�sa� zoznam tajn�ch k���ov"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "nespr�vny certifik�t"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "nespr�vny certifik�t"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "nespr�vny certifik�t"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "zmeni� heslo"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr ""
+"pou�i� implicitn� k��� ako implicitn�ho\n"
+" adres�ta"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "v�bec nepou��va� termin�l"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "vyn�ti� podpisy verzie 3"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "na �ifrovanie v�dy pou�i� MDC"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "automaticky odpoveda� �no na v��inu ot�zok"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
+
+#: sm/gpgsm.c:351
+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"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "prida� tento s�bor tajn�ch k���ov do zoznamu"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr ""
+"|PO��TA�|pou�i tento server k���ov na vyh�ad�vanie\n"
+" k���ov"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|pou�i� kompresn� algoritmus N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\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"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "pou�itie: gpg [mo�nosti] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "nem��em sa pripoji� k `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, fuzzy, c-format
+msgid "importing common certificates `%s'\n"
+msgstr "zapisujem do '%s'\n"
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "nem��em zavrie� `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "Celkovo spracovan�ch k���ov: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "vytvori� revoka�n� certifik�t"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "nem��em inicializova� datab�zu d�very: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "nem��em inicializova� datab�zu d�very: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? probl�m overenia revok�cie: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "chyba: neplatn� odtla�ok\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Platnos� podpisu vypr�ala %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Dobr� podpis od \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                alias \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "ukon�i�"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "uUqQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "riadok je pr�li� dlh�\n"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "VAROVANIE: Pou��van� pam� nie je bezpe�n�!\n"
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
 
-#: util/secmem.c:98
-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"
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: util/secmem.c:351
-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"
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "podpisovanie zlyhalo: %s\n"
 
-#: util/secmem.c:352
-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"
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "chyba pri posielan� na `%s': %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "chyba pri posielan� na `%s': %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "pou�itie: gpg [mo�nosti] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "verejn� k��� nen�jden�"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Pr�kazy:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "de�ifrovanie o.k.\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "de�ifrovanie o.k.\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [meno s�boru]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "Nie je dovolen� pou��va� %s s %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "nemo�no otvori� s�bor: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "nem��em vytvori� adres�r `%s': %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "nemo�no otvori� %s: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "%s: nem��em vytvori�: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "%s: nem��em vytvori�: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "aktualiz�cia zlyhala: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "aktualiz�cia zlyhala: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "aktualiz�cia zlyhala: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "aktualiz�cia zlyhala: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "nem��em vytvori� `%s': %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "nem��em vytvori� `%s': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+
+#, fuzzy
+#~ 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"
+
+#~ 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"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "nemo�no otvori� `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "zapisujem tajn� k��� do `%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "nem��em pou�i� pr�kaz stat na `%s': %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' nie je norm�lny s�bor - ignorovan�\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "pozn�mka: s�bor random_seed je pr�zdny\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "nem��em ��ta� `%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "nem��em zapisova� do `%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "nem��em zavrie� `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "VAROVANIE: pou�it� gener�tor n�hodn�ch ��sel nie je bezpe�n�!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "viac inform�ci� n�jdete v dokumente http://www.gnupg.cz/why-not-idea."
-#~ "html\n"
+#~ "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"
+
+#~ 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"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "\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 ""
-#~ "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo "
-#~ "medzery a kon�i� s '='\n"
+#~ "\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"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "tajn� k��� nie je dostupn�"
+
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
+
+#~ msgid "general error"
+#~ msgstr "v�eobecn� chyba"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "hodnota mus� obsahova� znak '@'\n"
+#~ msgid "unknown packet type"
+#~ msgstr "nezn�my typ paketu"
+
+#~ msgid "unknown version"
+#~ msgstr "nezn�ma verzia"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "nezn�my algoritmus verejn�ho k���a"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "nezn�my hashovac� algoritmus"
+
+#~ msgid "bad public key"
+#~ msgstr "neplatn� verejn� k���"
+
+#~ msgid "bad secret key"
+#~ msgstr "neplatn� tajn� k���"
+
+#~ msgid "bad signature"
+#~ msgstr "neplatn� podpis"
+
+#~ msgid "checksum error"
+#~ msgstr "chyba kontroln�ho s��tu"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "nezn�my �ifrovac� algoritmus"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "nem��em otvori� s�bor k���ov"
+
+#~ msgid "invalid packet"
+#~ msgstr "neplatn� paket"
+
+#~ msgid "invalid armor"
+#~ msgstr "neplatn� sp�sob reprezent�cie v ASCII"
+
+#~ msgid "no such user id"
+#~ msgstr "u��vate� s t�mto id neexistuje"
+
+#~ msgid "secret key not available"
+#~ msgstr "tajn� k��� nie je dostupn�"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "bol pou�it� nespr�vny tajn� k���"
+
+#~ msgid "not supported"
+#~ msgstr "nepodporovan�"
+
+#~ msgid "bad key"
+#~ msgstr "nespr�vny k���"
+
+#~ msgid "file read error"
+#~ msgstr "chyba pri ��tan� s�boru"
+
+#~ msgid "file write error"
+#~ msgstr "chyba pri z�pise s�boru"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "nezn�my kompresn� algoritmus"
+
+#~ msgid "file open error"
+#~ msgstr "chyba pri otv�ran� s�boru"
+
+#~ msgid "file create error"
+#~ msgstr "chyba pri vytv�ran� s�boru"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "nespr�vne heslo"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algoritmus verejn�ho k���a nie je implementovan�"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "�ifrovac� algoritmus nie je implementovan�"
+
+#~ msgid "unknown signature class"
+#~ msgstr "nezn�ma trieda podpisu"
+
+#~ msgid "trust database error"
+#~ msgstr "chyba v datab�ze d�very"
+
+#~ msgid "resource limit"
+#~ msgstr "obmedzenie zdrojov"
+
+#~ msgid "invalid keyring"
+#~ msgstr "neplatn� s�bor k���ov"
+
+#~ msgid "malformed user id"
+#~ msgstr "nespr�vny form�t id u��vate�a"
+
+#~ msgid "file close error"
+#~ msgstr "chyba pri zatv�ran� s�boru"
+
+#~ msgid "file rename error"
+#~ msgstr "chyba pri premenov�van� s�boru"
+
+#~ msgid "file delete error"
+#~ msgstr "chyba pri mazan� s�boru"
+
+#~ msgid "unexpected data"
+#~ msgstr "neo�ak�van� d�ta"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "konflikt �asov�ho raz�tka"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "nepou�ite�n� algoritmus s verejn�m k���om"
+
+#~ msgid "file exists"
+#~ msgstr "s�bor existuje"
+
+#~ msgid "weak key"
+#~ msgstr "slab� k���"
+
+#~ msgid "invalid argument"
+#~ msgstr "neplatn� argument"
+
+#~ msgid "bad URI"
+#~ msgstr "nespr�vne URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "toto URI nie je podporovan�"
+
+#~ msgid "network error"
+#~ msgstr "chyba siete"
+
+#~ msgid "not encrypted"
+#~ msgstr "neza�ifrovan�"
+
+#~ msgid "not processed"
+#~ msgstr "nespracovan�"
+
+#~ msgid "unusable public key"
+#~ msgstr "nepou�ite�n� verejn� k���"
+
+#~ msgid "unusable secret key"
+#~ msgstr "nepou�ite�n� tajn� k���"
+
+#~ msgid "keyserver error"
+#~ msgstr "chyba servera k���ov"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "neza�ifrovan�"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "hodnota mus� obsahova� znak '@'\n"
+#~ msgid "no data"
+#~ msgstr "ch�baj� podp�san� d�ta\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... toto je chyba v programe (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "VAROVANIE: Pou��van� pam� nie je bezpe�n�!\n"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
+#~ 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"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
+#~ 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"
+
+#~ 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"
 
-#~ msgid "not human readable"
-#~ msgstr "nie je v priamo �itate�nom form�te"
+#~ 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"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6473,10 +8086,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "chyba pri vytv�ran� hesla: %s\n"
-
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "nespr�vne heslo alebo nezn�my �ifrovac� algoritmus (%d)\n"
 
@@ -6489,18 +8098,9 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "nemo�no z�ska� server write file descriptor pre agenta\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "probl�m v komunik�cii s gpg-agentom\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "heslo je pr�li� dlh�\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "neplatn� reakcia od agenta\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "probl�m s agentom: agent vracia 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "vyberte sekund�rny k��� N"
 
@@ -6749,20 +8349,9 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ "tento �ifrovac� algoritmus je zastaral�; pros�m, pou�ite nejak� "
 #~ "�tandardnej��!\n"
 
-#, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "zapisujem do '%s'\n"
-
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "k��� `%s' nebol n�jden�: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "nem��em vytvori� `%s': %s\n"
-
 #, fuzzy
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "nemo�no otvori� s�bor: %s\n"
@@ -6808,9 +8397,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ msgid "%s: WARNING: empty file\n"
 #~ msgstr "%s: VAROVANIE: s�bor je pr�zdny\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "nemo�no otvori� %s: %s\n"
-
 #, fuzzy
 #~ msgid "   (%d) I trust marginally\n"
 #~ msgstr " %d = D�verujem �iasto�ne\n"
@@ -6847,9 +8433,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: nem��em vytvori�: %s\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: nem��em vytvori� adres�r: %s\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr ""
 #~ "Pokia� aj tak chcete pou�i� tento revokovan� k���, odpovedzte \"ano\"."
@@ -6857,9 +8440,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ msgid "Unable to open photo \"%s\": %s\n"
 #~ msgstr "Nemo�no otvori� fotografiu \"%s\": %s\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "nemo�no otvori� s�bor: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "chyba: ch�ba �iarka\n"
 
@@ -6875,9 +8455,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- n�jden� falo�n� revok�cia\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? probl�m overenia revok�cie: %s\n"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [platnos� skon��: %s]"
@@ -6889,9 +8466,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ msgid " [revoked: %s]"
 #~ msgstr "[revokovan�]"
 
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "%s: nem��em vytvori�: %s\n"
-
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
@@ -6935,20 +8509,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ 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"
 
@@ -6958,52 +8518,18 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ 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 "|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 "|[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"
 
@@ -7026,15 +8552,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ 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"
@@ -7087,9 +8604,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\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"
 
diff --git a/po/sv.po b/po/sv.po
index 758c31198..972e4f793 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -22,8 +22,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.6\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2004-12-01 17:49+0100\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -31,301 +31,733 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: agent/call-pinentry.c:193
 #, fuzzy, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
-msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "ingen demon för entropisamling hittad\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Ange en lösenmening. Detta är en hemlig mening\n"
 
-# se förra kommentaren
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "kan inte öppna \"%s\"\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "raden är för lång\n"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "lösenmeningen är för lång\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Felaktigt tecken i namnet\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+# MPI står för Multiple Precision Integer (tror jag)
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "felaktig MPI"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "felaktig lösenmening"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "felaktig lösenmening"
+
+# Skyddssammandraget låter underligt
+# Kontrollsumma?
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "skriver hemlig nyckel till \"%s\"\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "skyddssammandraget %d stöds inte\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "kan inte ta status på \"%s\": %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "fel vid skapandet av lösenmening: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "\"%s\" är inte än vanlig fil - ignorerad\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
+
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "Obs: filen random_seed är tom\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "hittade ingen hemlig nyckelring som gick att skriva till: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "VARNING: slumpkärnan har en felaktig storlek och används därför inte\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "kan inte läsa \"%s\": %s\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "Obs: random_seed uppdaterades inte\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Ange en lösenmening. Detta är en hemlig mening\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't create `%s': %s\n"
-msgstr "kan inte skapa \"%s\": %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:556 cipher/random.c:566
-#, c-format
-msgid "can't write `%s': %s\n"
-msgstr "kan inte skriva till \"%s\": %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "kan inte stänga \"%s\": %s\n"
+#: agent/divert-scd.c:217
+msgid "Admin PIN"
+msgstr ""
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Repetera lösenmeningen: "
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:278
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "lösenmeningen upprepades inte korrekt; försök igen."
+
+#: agent/divert-scd.c:290
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
-"Slumptalsgeneratorn är bara ett lappverk för att\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"
+
+# fel kapitalisering i originalet?
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
+msgstr ""
+"Du behöver en lösenmening för att skydda din hemliga nyckel\n"
 "\n"
 
-#: cipher/rndegd.c:202
-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"
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "ändra lösenmening"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
 msgstr ""
-"Vänta tills tillräckligt med entropi har samlats in. Fortsätt arbeta om\n"
-"det hindra dig att bli uttråkad, eftersom det förbättrar kvaliteten\n"
-"på entropin.\n"
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "ändra lösenmening"
+
+# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"\n"
-"Otillräcklig mängd slumpdata tillgängliga. Jobba med andra saker\n"
-"en stund för att ge operativsystemet en chans att samla mer entropi!\n"
-"(Behöver %d fler byte)\n"
+"@\n"
+"Flaggor:\n"
+" "
 
-#: g10/app-openpgp.c:596
-#, fuzzy, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
 
-#: g10/app-openpgp.c:609
-#, fuzzy, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "misslyckades med att radera nyckelblock: %s\n"
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "utförlig"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "var något tystare"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|FIL|ladda tilläggsmodul FIL"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
-#, c-format
-msgid "PIN callback returned error: %s\n"
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "sök efter nycklar hos en nyckelserver"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr ""
+"Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "uppdatera tillitsdatabasen"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "fel vid skapandet av lösenmening: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr ""
+"Rapportera gärna fel till <[email protected]>.\n"
+"Rapportera gärna fel eller synpunkter på översättningen till <[email protected]>.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
+
+#: agent/gpg-agent.c:241
+msgid ""
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
+msgstr ""
+
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
-#, fuzzy, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "Sändning till nyckelservern misslyckades: %s\n"
+#: agent/gpg-agent.c:303
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "OBS: inställningsfilen \"%s\" saknas\n"
+
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "inställningsfil \"%s\": %s\n"
+
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "läser inställningar från \"%s\"\n"
+
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "Fel vid skapande av `%s': %s\n"
+
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: kan inte skapa katalog: %s\n"
+
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "kan inte skapa \"%s\": %s\n"
+
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "fel vid sändning till \"%s\": %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "uppdateringen misslyckades: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "skriver hemlig nyckel till \"%s\"\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
+#, fuzzy, c-format
+msgid "directory `%s' created\n"
+msgstr "%s: katalog skapad\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: kan inte skapa katalog: %s\n"
+
+#: agent/gpg-agent.c:1427
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
 #, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "Fel vid skapande av `%s': %s\n"
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "misslyckades med att uppdatera hemligheten: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: hoppade över: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: agent/gpg-agent.c:1650
 #, fuzzy
-msgid "error reading application data\n"
-msgstr "fel vid läsning av nyckelblock: %s\n"
+msgid "no gpg-agent running in this session\n"
+msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
+
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "GPG-Agent protokoll version %d stöds inte\n"
+
+#: agent/preset-passphrase.c:100
 #, fuzzy
-msgid "error reading fingerprint DO\n"
-msgstr "fel: ogiltigt fingeravtryck\n"
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
+#: agent/protect-tool.c:146
 #, fuzzy
-msgid "key already exists\n"
-msgstr "`%s' är redan komprimerad\n"
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: agent/protect-tool.c:1206
 #, fuzzy
-msgid "generating new key\n"
-msgstr "generera ett nytt nyckelpar"
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Ange en lösenmening. Detta är en hemlig mening\n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Ange en lösenmening. Detta är en hemlig mening\n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Ange en lösenmening. Detta är en hemlig mening\n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "felaktig lösenmening"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "fel vid skapandet av lösenmening: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "Avbryt"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "inställningsfil \"%s\": %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "de hemliga nyckeldelarna är inte tillgänliga\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "läsfel:  %s\n"
+
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: agent/trustlist.c:453
 #, fuzzy
-msgid "generating key failed\n"
-msgstr "Nyckelgenereringen misslyckades: %s\n"
+msgid "Yes"
+msgstr "ja"
 
-#: g10/app-openpgp.c:1904
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "Nyckelgenereringen misslyckades: %s\n"
+msgid "error creating a pipe: %s\n"
+msgstr "fel vid skapandet av lösenmening: %s\n"
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+# Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
+# fixa en patch?
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "Kan inte öppna fil: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s signatur, sammandragsalgoritm %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "Fel vid skapande av `%s': %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[Hittade inte användaridentiteten]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "kan inte ansluta till \"%s\": %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "problem vid kommunikation med GPG-Agent\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "avbruten av användaren\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "kan inte stänga av minnesutskrifter: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "VARNING: %s osäker ägare till %s\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "ja"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "jJ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "nej"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "avsluta"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "aA"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
-#, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
+#: common/yesno.c:114
+msgid "oO"
 msgstr ""
 
+#: common/yesno.c:115
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: g10/armor.c:320
 #, c-format
 msgid "armor: %s\n"
@@ -407,176 +839,219 @@ msgstr ""
 "beror sannolikt på att en felaktig e-postserver eller e-postklient har "
 "använts\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n"
+"understrykningstecken och sluta med ett likhetstecken\n"
+
+# user notation name??
+# Werner:
+# That is an OpenPGP notation name not registered with IANA.
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
+
+# user notation name??
+# Werner:
+# That is an OpenPGP notation name not registered with IANA.
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
+
+#: g10/build-packet.c:980
+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/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "VARNING: ogiltig noteringsdata hittades\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "inte möjlig att läsa för människor"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "den hemliga nyckeln är inte tillgänglig"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i batch-läge\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 #, fuzzy
 msgid "unspecified"
 msgstr "Ingen anledning har angivits"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 #, fuzzy
 msgid "not forced"
 msgstr "inte behandlade"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ingen tillhörande öppen nyckel: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uppdaterat inställningar"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "visa fingeravtryck"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -584,206 +1059,154 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Välj anledning till att nyckeln spärras:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "okänd krypteringsalgoritm\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 #, fuzzy
 msgid "show admin commands"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 #, fuzzy
 msgid "list all available data"
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 #, fuzzy
 msgid "change the login name"
 msgstr "ändra utgångsdatum"
 
 # originalet borde ha ett value
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "generate new keys"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Felaktigt kommando (försök med \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "den hemliga nyckeln är inte tillgänglig"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "misslyckades med att radera nyckelblock: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr ""
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr ""
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr ""
-
-#: g10/cardglue.c:937
-#, fuzzy
-msgid "Repeat this PIN: "
-msgstr "Repetera lösenmeningen: "
-
-#: g10/cardglue.c:952
-#, fuzzy
-msgid "PIN not correctly repeated; try again"
-msgstr "lösenmeningen upprepades inte korrekt; försök igen."
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output kan inte användas för detta kommando\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -826,47 +1249,47 @@ msgstr "det finns en hemlig nyckel tillhörande denna öppna nyckel!\"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "använderchiffer %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' är redan komprimerad\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "du kan endast kryptera till RSA nycklar som är högst 2048 bitar långa i --"
 "pgp2-läge\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kan inte använda IDEA-kryptering för alla nycklar du krypterar till.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -874,7 +1297,7 @@ msgstr ""
 "att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inställningar\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -883,106 +1306,101 @@ msgstr ""
 "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens "
 "inställningar\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inställningar\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, 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/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterad data\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
 # I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel\n"
 "i den symmetriska krypteringen.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "problem vid hanteringen av krypterat paket\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "ingen körning av fjärrprogram stöds\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "%s: kan inte skapa katalog: %s\n"
-
 # Behörighet att komma åt inställningarna, tror jag. Inte behörigheter i inställningsfilen.
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "anrop av externa program är avstängt pga osäkra behörigheter för\n"
 "inställningsfilen\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "denna plattform kräver temp-filer vid anrop av externa program\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Kunde inte köra %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Kunde inte köra %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfel när externa program anropades: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "externa program avslutades felaktigt\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "Kunde inte köra det externa programmet\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "kan inte läsa svaret från det externa programmet: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
@@ -990,70 +1408,111 @@ msgstr ""
 "Signaturen kommer att markeras som icke möjlig att återkalla.\n"
 "\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "hittade inga spärrnycklar till `%s'\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "spärra en undernyckel"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "oanvändbar hemlig nyckel"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "nyckeln %08lX är inte skyddad - hoppade över den\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - hoppade över den\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "nyckel %08lX: signatur på undernyckel på fel plats - hoppade över "
 "signaturen\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "för många poster i pk-cachen - avstängd\n"
+
+#: g10/getkey.c:176
+#, fuzzy
+msgid "[User ID not found]"
+msgstr "[Hittade inte användaridentiteten]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, 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:2381 g10/keyedit.c:3708
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr ""
+"det finns ingen hemlig undernyckel tillhörande den öppna undernyckeln %08lX "
+"- hoppar över\n"
+
+#: g10/getkey.c:2612
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n"
+
+#: g10/getkey.c:2659
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "nyckel %08lX: hemlig nyckel utan öppen nyckel - hoppade över den\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1061,130 +1520,131 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "endast symmetrisk kryptering"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "visa en lista på nycklar"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "visa en lista på nycklar och signaturer"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "visa en lista på nycklar och fingeravtryck"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "visa en lista på hemliga nycklar"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den öppna nyckelringen"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importera/slå ihop nycklar"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1194,53 +1654,49 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sätt kompressionsnivån till N (0 för att stänga av kompression)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "utförlig"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "Fråga före ersättning"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1248,7 +1704,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1268,18 +1724,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 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/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1289,7 +1745,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1297,656 +1753,595 @@ msgstr ""
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "öppen nyckel: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänt configurationspost \"%s\"\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "visa vilken nyckelring den listade nyckeln hör till"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "OBS: inställningsfilen \"%s\" saknas\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "inställningsfil \"%s\": %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "läser inställningar från \"%s\"\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n"
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte sätta exec-sökvägen till %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, 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/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 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"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 #, 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"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:2986
+#: g10/gpg.c:3010
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "felaktigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:2988
+#: g10/gpg.c:3012
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "felaktigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "felaktigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "felaktiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda chifferalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, 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/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, 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/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig kontrollsummealgoritm `%s'\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "för många poster i pk-cachen - avstängd\n"
-
-#: g10/getkey.c:175
-#, fuzzy
-msgid "[User ID not found]"
-msgstr "[Hittade inte användaridentiteten]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, 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:2380 g10/keyedit.c:3707
-#, fuzzy, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr ""
-"det finns ingen hemlig undernyckel tillhörande den öppna undernyckeln %08lX "
-"- hoppar över\n"
-
-#: g10/getkey.c:2611
-#, fuzzy, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n"
-
-#: g10/getkey.c:2658
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "nyckel %08lX: hemlig nyckel utan öppen nyckel - hoppade över den\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "var något tystare"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "ta nycklarna från denna nyckelring "
 
 # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
 # Kommandot är avsett att användas i "near online system".
 # Krav från RIPE.
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1954,7 +2349,7 @@ msgstr ""
 "Syntax: gpg [flaggor] [filer]\n"
 "Kolla signaturerna mot betrodda nycklar\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1965,7 +2360,7 @@ msgstr ""
 "\"nätet av tillit\". Det har inget att göra med det (implicit skapade)\n"
 "nätet av certifikat."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1977,16 +2372,16 @@ msgstr ""
 "- det är vanligen de nycklar som du disponerar den hemliga nyckeln för.\n"
 "Svara  \"ja\" för att markera att du litar förbehållslöst på denna nyckel.\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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:66
+#: g10/helptext.c:68
 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2000,7 +2395,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -2010,16 +2405,16 @@ msgstr ""
 "och kryptering. Denna algoritm ska endast användas inom särskilda\n"
 "områden. Rådgör med din egen säkerhetsexpert first!"
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Ange storleken på nyckeln"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svara \"ja\" eller \"nej\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -2031,19 +2426,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:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Ange namnet på nyckelns ägare"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Ange en kommentar (frivilligt)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2057,11 +2452,11 @@ msgstr ""
 "O  för att fortsätta med nyckelgenerering.\n"
 "Q  för att avsluta nyckelgenereringen."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 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:148
+#: g10/helptext.c:150
 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"
@@ -2143,12 +2538,12 @@ msgstr ""
 "Om du inte vet vad du ska svara, så svara \"0\"."
 
 # felstavat original meddelat till Werner.
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Svara \"ja\" om du vill signera ALLA användaridentiteter"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2156,11 +2551,11 @@ msgstr ""
 "Svara \"ja\" om du verkligen vill ta bort denna användaridentitet.\n"
 "Alla certifikat kommer att gå förlorade!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Svara \"ja\" om du vill ta bort denna undernyckel"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2171,7 +2566,7 @@ msgstr ""
 "en tillitskoppling till nyckeln eller en annan nyckel som är\n"
 "certifierad av denna nyckel."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2183,7 +2578,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:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2192,7 +2587,7 @@ msgstr ""
 "din nyckelring."
 
 # borde inge GnuPG bytas ut mot gpg eller ännu bättre %s?
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2206,7 +2601,7 @@ msgstr ""
 "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:223
+#: g10/helptext.c:225
 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"
@@ -2218,24 +2613,24 @@ msgstr ""
 "påverkade\n"
 "egensignaturer kommer att flyttas fram en sekund.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Ange en lösenmening. Detta är en hemlig mening\n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Reptera lösenmeningen, så du är säker på vad du skrev in."
 
 # # felstavat/ologiskt original
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "Ange namnet på den fil signaturen gäller"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svara \"ja\" om det du vill skriva över filen"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2243,7 +2638,7 @@ msgstr ""
 "Ange ett nytt filnamn. Om du bara trycker RETUR kommer standarfilnamnet\n"
 "(som anges i hakparenteser) att användas."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2273,7 +2668,7 @@ msgstr ""
 "     skall användas. Detta används normalt för att visa att en e-postadress\n"
 "     är ogiltig.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2284,11 +2679,11 @@ msgstr ""
 "och koncis.\n"
 "En tom rad avslutar texten.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Det finns ingen hjälp tillgänglig"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
@@ -2324,391 +2719,386 @@ msgstr "oanvändbar hemlig nyckel"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "har behandlat %lu nycklar hittills\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "          överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan användaridentiteter: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      oförändrade: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya användaridentiteter: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nya spärrar av nycklar: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                   inte importerade: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr ""
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Du har signerat följande användaridentiteter:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:749
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %08lX: HKP-skadad undernyckel har reparerats!\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:764
+#: g10/import.c:763
 #, fuzzy, c-format
 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:770
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en egensignatur\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen öppen nyckel: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %08lX: ny nyckel - hoppade över den\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:825
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, 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:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, 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:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, 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:911
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %08lX: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %08lX: \"%s\" inte ändrad\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, 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 den\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, 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:1233
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nyckel %08lX: öppen nyckel saknas - kan inte spärra nyckeln med "
 "spärrcertifikatet\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nyckel %08lX: algoritmen för öppna nycklar stöds inte för användar-ID  \"%s"
 "\"\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %08lX: ogiltig egensignatur på användar-id \"%s\"\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen för öppna nycklar stöds inte\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %08lX: tog bort multipla bindningar av undernyckel\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %08lX: ingen undernyckel för spärr av nyckeln\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %08lX: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %08lX: tog bort multipla spärrar av undernyckel\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %08lX: hoppade över användaridentitet '"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade över undernyckel\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "nyckel %08lX: spärrcertifikat på fel plats - hoppade över certifikatet\n"
 
 # nyckeln eller certifikatet??
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - hoppade över det\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
@@ -2716,118 +3106,118 @@ msgstr ""
 "signaturen\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "nyckel %08lX: användaridentitet hittades flera gånger - slog ihop till en\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, 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:1802
+#: g10/import.c:1801
 #, 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:1861
+#: g10/import.c:1860
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %08lX: lagt till direkt nyckelsignatur\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "den öppna nyckel passar inte ihop med den hemliga nyckeln!\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "Fel vid skapande av `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[egensignatur]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2841,63 +3231,63 @@ msgstr ""
 "källor...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Jag litar marginellt på denna användare\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Jag litar fullständigt på denna användare\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 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:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användar-ID \"%s\" är spärrat."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för nvändar-ID \"%s\" har gått ut.."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användar-ID \"%s\" saknar egensignatur."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Användar-ID \"%s\" saknar egensignatur."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2906,11 +3296,11 @@ msgstr ""
 "Egensignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 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:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2919,13 +3309,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
 "n) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2934,44 +3324,44 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du ändra den till en fullständigt exporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" var redan signerad lokalt av nyckeln %08lX\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 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:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2979,11 +3369,11 @@ 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:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Detta skulle göra nyckeln oanvändbar i PGP 2.x.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2992,33 +3382,33 @@ 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:921
+#: g10/keyedit.c:922
 #, 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:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "     (1) Jag har inte kontrollerat identiteten alls.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "     (2) Jag har gjort viss kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, 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:933
+#: g10/keyedit.c:934
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv '?' för mer information): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3027,14 +3417,14 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Detta kommer att bli en egensignatur\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -3042,7 +3432,7 @@ msgstr ""
 "VARNING: signaturen kommer att markeras som exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -3050,7 +3440,7 @@ msgstr ""
 "VARNING: Signaturen kommer att markeras som möjlig att spärra.\n"
 "\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -3058,7 +3448,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -3066,65 +3456,65 @@ msgstr ""
 "Signaturen kommer att markeras som icke möjlig att återkalla.\n"
 "\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Jag har inte kontrollerat identiteten alls.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Jag har gjort viss kontroll av identiteten.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Jag har gjort en noggrann kontroll av identiteten.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3132,11 +3522,11 @@ msgstr ""
 "Skriv in den nya lösenmening för denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3144,210 +3534,210 @@ msgstr ""
 "Du vill inte ha någon lösenmening - detta är sannolikt en *dålig* idé!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "visa en lista på nycklar och användaridentiteter"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "select subkey N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 #, fuzzy
 msgid "check signatures"
 msgstr "återkalla signaturer"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Tips: Välj de användarID:n du vill signera\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "lägg till ett foto som användaridentitet"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "ta bort en användaridentitet"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "ta bort en undernyckel"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "markera användaridentiteten som huvudidentitet"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "hoppa mellan att visa en lista på hemliga eller öppna nycklar"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "visa en lista på  inställningar (expertläge)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "visa en lista på inställningar (utförligt)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "ändra lösenmening"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "spärra en användaridentitet"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "spärra en undernyckel"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "enable key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "disable key"
 msgstr "stäng av en nyckel"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "visa foto-ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fel vid läsning av hemligt nyckelblock\"%s\": %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 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:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3355,243 +3745,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vill du verkligen signera alla användaridentiteter? "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användarID:n du vill signera\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "okänd signaturklass"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vill du verkligen spärra denna användaridentitet? "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vill du verkligen spärra de valda nycklarna? "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ange inställningslista"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen ändra inställningarna?"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringarna? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 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:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Notering: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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:2689
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Denna nyckel kan spärras av nyckeln %s"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denna nyckel kan spärras av nyckeln %s"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (känsligt)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3599,19 +3989,19 @@ msgstr ""
 "Obs! Den visade nyckelgiltigheten kan vara felaktig\n"
 "om du inte startar om programmet.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3620,7 +4010,7 @@ msgstr ""
 "Detta kommando kan göra att ett annat användar-ID antas\n"
 "vara huvudidentitet.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3630,56 +4020,56 @@ msgstr ""
 "vissa versioner\n"
 "         av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett fofo-ID till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "felaktigt skal"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3688,33 +4078,33 @@ 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:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användar-ID för spärrnyckeln: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Du kan inte ange en nyckel som sin egen spärrnyckel\n"
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ändra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3722,347 +4112,352 @@ msgstr ""
 "Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/"
 "N): "
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som högst en undernyckel.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar giltighetstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för huvudnyckeln.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 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:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
 # Vad betyder det?
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VARNING: Signeringsundernyckeln %08lX är inte korscertifierad\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja bara en användaridentitet.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3 egensignatur på användar-id \"%s\"\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Signaturnotering: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Skriv över (j/N)? "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? (j/N)"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   spärrad av %08lX %s\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VARNING: en signatur på ett användar-ID är daterad %d sekunder in i "
 "framtiden\n"
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Visar %s foto-ID med storleken %ld för nyckeln 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "inställningen %c%lu förekommer flera gånger\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "för många `%c' inställningar\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "för många `%c' inställningar\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "för många `%c' inställningar\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "skriver egensignatur\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "felaktig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 #, fuzzy
 msgid "Encrypt"
 msgstr "kryptera data"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, 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:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4079,7 +4474,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:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4095,40 +4490,40 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "För hur lång tid ska signaturen vara giltig? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "felaktigt värde\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "Giltighetstiden för %s går aldrig ut\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "Giltighetstiden för %s går aldrig ut\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "Giltighetstiden för %s går ut vid följande tidpunkt: %s\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4136,12 +4531,12 @@ 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:1692
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta (j/n)? "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 #, fuzzy
 msgid ""
 "\n"
@@ -4158,44 +4553,44 @@ msgstr ""
 "     \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Felaktigt tecken i namnet\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Felaktigt tecken i kommentaren\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckenuppsättningen \"%s\"\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4206,7 +4601,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 
@@ -4222,24 +4617,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 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:1829
+#: g10/keygen.c:1997
 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:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4247,12 +4642,12 @@ msgstr ""
 "Du behöver en lösenmening för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4263,7 +4658,7 @@ msgstr ""
 "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:1926
+#: g10/keygen.c:2094
 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"
@@ -4275,50 +4670,50 @@ 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:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den öppna nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "hittade ingen öppen nyckelring att skriva till: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "hittade ingen hemlig nyckelring som gick att skriva till: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av öppna nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "den öppna och den  hemliga nyckeln är skapade och signerade.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4328,13 +4723,13 @@ msgstr ""
 "kanske att vilja använda kommandot \"--edit-key\" för att skapa en\n"
 "undernyckel för detta syfte.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4342,7 +4737,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:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4350,31 +4745,31 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "aldrig"
 
@@ -4402,638 +4797,611 @@ msgstr "Signaturnotering: "
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "    Undernyckelns fingeravtryck:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "     Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
 # Enligt Werner uppstår detta om något går snett när den hemliga nyckeln uppdateras.
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrollerar nyckelringen `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu nycklar och %lu signaturer har kontrollerats\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu nycklar och %lu signaturer har kontrollerats\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VARNING: inställningar i `%s' är ännu inte aktiva under denna körning\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s  krypterad sessionsnyckel\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenmening skapad  med okänd sammandragsalgoritm %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "den öppna nyckeln är %08lX\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat till öppen nyckel: Giltig DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, 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:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "öppen nyckel-dekryptering misslyckades: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenmeningar\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenmening\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, 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:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
 # Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
 # Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående spärrcertifikat - använd \"gpg --import\" för\n"
 "att applicera\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrekt signatur från \""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera dessa multipla signaturer\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, 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:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Giltighetstiden har upphört för signatur från \""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \""
 
 # Visas vid ogiltig signatur:
 # Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
 "kontrolleras.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "kan inte stänga av minnesutskrifter: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "kan inte hantera algoritm %d för öppna nycklar\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "krypteringsalgorimten är inte införd"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Insticksprogram för IDEA-kryptering är inte installerat\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = visa mer information\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: alternativet är föråldrat\"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Okomprimerad"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, 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:1017
+#: g10/misc.c:1106
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "den förvalda mottagaren \"%s\" är okänd\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Filen \"%s\" finns. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Skriv över (j/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: okänt suffix\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signera data finns i filen \"%s\"\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurationsfil `%s'skapad\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "VARNING: inställningar i `%s' är ännu inte aktiva under denna körning\n"
 
-#: g10/openfile.c:424
-#, fuzzy, c-format
-msgid "directory `%s' created\n"
-msgstr "%s: katalog skapad\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritm %d för öppna nycklar\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, 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:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "GPG-Agent protokoll version %d stöds inte\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "kan inte ansluta till \"%s\": %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem med GPG-Agent, stänger av den\n"
@@ -5099,7 +5467,7 @@ msgstr ""
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenmeningen: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5113,40 +5481,36 @@ msgstr ""
 "en mycket stor bild, så blir din nyckel också väldigt stor!\n"
 "Försök att använda en bild som har ungefär  formatet 240x288 pixlar.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Skriv JPEG-filnamnet för foto-ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Kan inte öppna fotot \"%s\": %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" är inte en  JPEG-fil\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Är detta foto korrekt (j/N/a)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-ID!\n"
 
@@ -5439,62 +5803,57 @@ msgstr "inga giltiga adressater\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "Fel vid skapande av `%s': %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Signatur i en separat fil.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, fuzzy, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonym mottagare; försöker med den hemliga nyckeln %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den hemliga mottagaren.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "krypteringsalgoritmen %d%s är okänd eller avstängd\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "OBS: krypteringsalgoritmen %d finns inte i inställningarna\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "OBS: den hemliga nyckeln %08lX gick ut %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "OBS: nyckeln har spärrats"
 
@@ -5623,97 +5982,97 @@ msgstr "(Ingen beskrivning angiven)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Är detta OK?"
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgänliga\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "skyddsalgoritmen %d%s stöds inte\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "skyddssammandraget %d stöds inte\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Fel lösenmening; försök igen!"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
 # För vissa krypteringsalgoritmer är det känt att vissa svaga nycklar kan förekomma. Dessa ska aldrig användas. GnuPG vill på detta sätt hindra dig från att skapa en sådan nyckel.
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenmening igen.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga "
 "nyckeln\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "skapade en svag nyckel - försöker igen\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "kan inte undvika en svag nyckel för symmetrisk kryptering; försökte\n"
 "%d gånger!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
 
 # Vad betyder det?
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VARNING: Signeringsundernyckeln %08lX är inte korscertifierad\n"
 
 # cross-certification?
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VARNING signeringsundernyckel  %08lX har en ogiltig korscertiifiering\n"
 
 # behövs verkligen c-format här?
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "den öppna nyckeln %08lX är %lu sekund nyare än signaturen\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "den öppna nyckeln %08lX är %lu sekunder nyare än signaturen\n"
 
 # c-format behövs inte i singularis
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5721,7 +6080,7 @@ 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:195
+#: g10/sig-check.c:205
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5729,60 +6088,60 @@ 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:205
+#: g10/sig-check.c:215
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "OBS: signaturnyckeln %08lX, gick ut vid %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "antar att signaturen gjord med nyckel %08lX är felaktig eftersom en okänd "
 "kritisk bit är satt\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "nyckel %08lX: ingen undernyckel till paket för spärr av undernyckel\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "nyckel %08lX: ingen undernyckel till signatur för bindning av undernyckel\n"
 
 # notation data?
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "kan inte lägga till noteringar i signaturer gjorda med en v3-nyckel\n"
 "(PGP 2.x-typ)\n"
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "kan inte lägga till noteringar i nyckelsignaturer signaturer gjorda med en "
 "v3-nyckel (PGP 2.x-typ)\n"
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VARNING: kan inte %%-expandera anteckning (för stor).  Använder den utan "
 "expansion.\n"
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "kan inte ange en policy-URL i v3 (PGP 2.x style) signaturer\n"
 
-#: g10/sign.c:132
+#: g10/sign.c:133
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "kan inte lägga till en policy-URL i signaturer gjorda med en v3-nyckel (PGP "
 "2.x-typ)\n"
 
-#: g10/sign.c:145
+#: g10/sign.c:146
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5790,7 +6149,7 @@ msgstr ""
 "VARNING: kan inte %%-expandera policy-url (för stor).  Använder den utan "
 "expansion.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5809,13 +6168,13 @@ msgstr "försök att verifiera den skapade signaturen misslyckades: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur från: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n"
 "när du är i --pgp2-läge\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5823,43 +6182,43 @@ msgstr ""
 "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?"
 "llningar\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra klartextsignaturer med en PGP 2.x-nyckel\n"
 "när du är i --pgp2-läge\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "nyckeln är inte markerad som osäker - det går inte att använda den med "
 "fejkad slumptalsgenerator!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppade över \"%s\": förekommer flera gånger\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över  `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5919,52 +6278,52 @@ msgstr "läsfel:  %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion för stor\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan inte stänga \"%s\": %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
 # se förra kommentaren
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
@@ -5973,78 +6332,78 @@ msgstr "%s: tillitsdatabas skapad\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ogiltig tillitsdatabas\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid läsning av versionspost: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: detta är inte en tillitsdatabasfil\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid läsning av ledig post: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, 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:1459
+#: g10/tdbio.c:1452
 #, 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:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
 
@@ -6053,7 +6412,7 @@ msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "kan inte hantera text med rader längre än %d tecken\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
@@ -6229,7 +6588,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6239,350 +6598,1619 @@ msgstr ""
 "Kom ihåg att signaturfilen (.sig eller .asc)\n"
 "ska vara den först angivna filen på kommandoraden\n"
 
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "allmänt fel"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "okänd pakettyp"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "okänd version"
+# Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
+# fixa en patch?
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "Kan inte öppna fil: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "okänd algoritm för publik nyckel"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "okänd algoritm för beräkning av sammandrag"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "felaktig öppen nyckel"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "felaktig hemlig nyckel"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr ""
+"Rapportera gärna fel till <[email protected]>.\n"
+"Rapportera gärna fel eller synpunkter på översättningen till <[email protected]>.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "felaktig signatur"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "fel vid beräkning av kontrollsumma"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "felaktig lösenmening"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "hittade inte den öppna nyckeln"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "okänd krypteringsalgoritm"
+#: scd/app-openpgp.c:596
+#, fuzzy, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "kan inte öppna nyckelringen"
+#: scd/app-openpgp.c:609
+#, fuzzy, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "felaktigt paket"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "felaktigt skal"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr ""
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "okänd användaridentitet"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "den hemliga nyckeln är inte tillgänglig"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "fel hemlig nyckel har använts"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr ""
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "inte stödd"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr ""
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "felaktig nyckel"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, fuzzy, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "fel vid läsning av fil"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr ""
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "fel vid skrivning av fil"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr ""
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "okänd komprimeringsalgoritm"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr ""
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "fel vid öppnande av fil"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "fel vid skapande av fil"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr ""
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "fel lösenmening"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr ""
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "algoritmen för publik nyckel är inte införd"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr ""
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "krypteringsalgorimten är inte införd"
+#: scd/app-openpgp.c:1535
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "Fel vid skapande av `%s': %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "okänd signaturklass"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "fel vid läsning av nyckelblock: %s\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "fel i tillitsdatabasen"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "fel: ogiltigt fingeravtryck\n"
 
-# MPI står för Multiple Precision Integer (tror jag)
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "felaktig MPI"
+#: scd/app-openpgp.c:1601
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' är redan komprimerad\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "resursbegränsning"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr ""
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "felaktig nyckelring"
+#: scd/app-openpgp.c:1607
+#, fuzzy
+msgid "generating new key\n"
+msgstr "generera ett nytt nyckelpar"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "felaktigt certifikat"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "felformaterad användaridentitet"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "fel vid stängning av fil"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr ""
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "fel vid namnbyte av fil"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "fel vid borttagande av fil"
+#: scd/app-openpgp.c:1866
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "oväntad data"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr ""
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "konflikt mellan tidsstämplar"
+#: scd/app-openpgp.c:1939
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "oanvändbar algoritm för publika nycklar"
+#: scd/app-openpgp.c:1942
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "filen finns"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "svag nyckel"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "felaktigt argument"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "felaktig URI"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "denna URI stöds inte"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "nätverksfel"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "inte krypterad"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "inte behandlade"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "läser inställningar från \"%s\"\n"
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "oanvändbar öppen nyckel"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "oanvändbar hemlig nyckel"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAMN|använd NAMN som förvald mottagare"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "nyckelserverfel"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAMN|använd NAMN som förvald mottagare"
 
-#: util/errors.c:109
+#: scd/scdaemon.c:126
 #, fuzzy
-msgid "canceled"
-msgstr "Avbryt"
+msgid "do not use the internal CCID driver"
+msgstr "använd inte terminalen alls"
+
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
+#: scd/scdaemon.c:132
 #, fuzzy
-msgid "no card"
-msgstr "inte krypterad"
+msgid "allow the use of admin card commands"
+msgstr "motstridiga kommandon\n"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "ingen signerad data\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
-#: util/logger.c:158
-msgid "ERROR: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... detta är ett fel i programmet (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "ja"
+# överhoppad eller hoppades över?
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "hoppade över felaktigt radix64-tecken %02x \n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "jJ"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "GPG-Agent protokoll version %d stöds inte\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "GPG-Agent protokoll version %d stöds inte\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "kan inte öppna \"%s\": %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "skriver hemlig nyckel till \"%s\"\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "OBS: nyckeln har spärrats"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "felaktigt certifikat"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Nyckeln tillgänglig hos: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "försök att verifiera den skapade signaturen misslyckades: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "generera ett spärrcertifikat"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Giltighetstiden för denna nyckel har gått ut!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "visa fingeravtryck"
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "försök att verifiera den skapade signaturen misslyckades: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "verifiera en signatur"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA kräver att du använder en 160-bitars kontrollsummealgoritm\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "nej"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "okänd"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "fel: ogiltigt fingeravtryck\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "fel: ogiltigt fingeravtryck\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"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"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "felaktig kontrollsummealgoritm `%s'\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "E-postadressen är ogiltig\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "den hemliga nyckeln `%s' hittades inte: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "fel vid läsning av nyckelblock: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "Spärrcertifikat skapat.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "inställningen %c%lu förekommer flera gånger\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "misslyckades med att radera nyckelblock: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(Ingen beskrivning angiven)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "fel vid skapandet av lösenmening: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: fel vid läsning av katalogpost: %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[fil]|skapa en signatur"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[fil]|skapa en klartext-signatur"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "visa en lista på hemliga nycklar"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "felaktigt certifikat"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "ta bort nycklar från den öppna nyckelringen"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "felaktigt certifikat"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "felaktigt certifikat"
+
+#: sm/gpgsm.c:263
+msgid "register a smartcard"
+msgstr ""
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "ändra lösenmening"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "skapa utdata med ett ascii-skal"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NAMN|använd NAMN som förvald mottagare"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "använd standardnyckeln som förvald mottagare"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "använd inte terminalen alls"
+
+# Alltså även för V4-nycklar. För att vara PGP-kompatibel.
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "använd alltid v3-signaturer"
+
+# Framtvingar användning av mdc även vid äldre chiffer. Ej kompatibelt med pgp.
+# Cast-5 används som standard  vid symmetrisk kryptering. Detta kommando integritetskyddar då den krypterade filen. Onödigt om nyare chiffer angivits med --personal-cipher-preferences
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "använd alltid en MDC vid kryptering"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "batch-läge: fråga aldrig"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "anta att svaret är ja på de flesta frågor"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "anta att svaret är nej på de flesta frågor"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "lägg till denna nyckelring till listan över nyckelringar"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "lägg till denna hemliga nyckelring till listan"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|VÄRD|använd denna nyckelserver för att slå upp nycklar"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NAMN|sätt teckentabellen för terminalen till NAMN"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|FIL|ladda tilläggsmodul FIL"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAMN|använd krypteringsalgoritmen NAMN"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAMN|använd kontrollsummealgoritmen NAMN"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|använd komprimeringsalgoritmen N"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
+
+# Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Syntax: gpg [flaggor] [filer]\n"
+"signera, kontrollera, kryptera eller dekryptera\n"
+"vilken operation som utförs beror på programmets indata\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "användning: gpg [flaggor] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "kan inte ansluta till \"%s\": %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "kan inte stänga \"%s\": %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "  Totalt antal behandlade enheter: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "generera ett spärrcertifikat"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "fel vid skapandet av lösenmening: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "%s: nyckelring skapad\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "fel vid skapandet av lösenmening: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "fel vid skapandet av lösenmening: %s\n"
+
+# betydelse?
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "rev? problem vid kontroll av spärren: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "Fel vid skapande av `%s': %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "fel: ogiltigt fingeravtryck\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "försök att verifiera den skapade signaturen misslyckades: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "Giltighetstiden för signaturen har upphört %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "Korrekt signatur från \""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "      även känd som \""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "avsluta"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "aA"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
 msgstr ""
 
-#: util/miscutil.c:411
+#: tools/gpg-connect-agent.c:126
 #, fuzzy
-msgid "cC"
-msgstr "c"
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "raden är för lång\n"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "den förvalda mottagaren \"%s\" är okänd\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "signeringen misslyckades: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "misslyckades med att radera nyckelblock: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "fel vid sändning till \"%s\": %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "fel vid sändning till \"%s\": %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "användning: gpg [flaggor] "
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "Varning: använder osäkert minne!\n"
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "se http://www.gnupg.org/faq.html för mer information\n"
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "hittade inte den öppna nyckeln"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operationen är inte möjlig utan tillgång till säkert minne\n"
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
 
-#: util/secmem.c:352
-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"
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Kommandon:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "dekrypteringen lyckades\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "dekrypteringen lyckades\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA kräver att du använder en 160-bitars kontrollsummealgoritm\n"
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [filnamn]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s är inte tillåten tillsammans med %s!\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "%s är inte tillåten tillsammans med %s!\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "%s: kan inte skapa katalog: %s\n"
+
+# Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
+# fixa en patch?
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "kan inte öppna %s: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "ingen körning av fjärrprogram stöds\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "kan inte skapa \"%s\": %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "kan inte skapa \"%s\": %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "uppdateringen misslyckades: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "misslyckades med att radera nyckelblock: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "uppdateringen misslyckades: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "uppdateringen misslyckades: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "uppdateringen misslyckades: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+# Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
+# fixa en patch?
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "Kan inte öppna fil: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "kan inte skapa \"%s\": %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+# Skyddssammandraget låter underligt
+# Kontrollsumma?
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "skyddssammandraget %d stöds inte\n"
+
+#, fuzzy
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "ingen demon för entropisamling hittad\n"
+
+# se förra kommentaren
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "kan inte öppna \"%s\"\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "skriver hemlig nyckel till \"%s\"\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "kan inte ta status på \"%s\": %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "\"%s\" är inte än vanlig fil - ignorerad\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "Obs: filen random_seed är tom\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr ""
+#~ "VARNING: slumpkärnan har en felaktig storlek och används därför inte\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "kan inte läsa \"%s\": %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "Obs: random_seed uppdaterades inte\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "kan inte skriva till \"%s\": %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "kan inte stänga \"%s\": %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-#~ msgstr "Mer information finns på: http://www.gnupg.org/why-not-idea.html\n"
+#~ "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 ""
+#~ "Slumptalsgeneratorn är bara ett lappverk för att\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"
+#~ "\n"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "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 ""
-#~ "ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n"
-#~ "understrykningstecken och sluta med ett likhetstecken\n"
+#~ "Vänta tills tillräckligt med entropi har samlats in. Fortsätt arbeta om\n"
+#~ "det hindra dig att bli uttråkad, eftersom det förbättrar kvaliteten\n"
+#~ "på entropin.\n"
 
-# user notation name??
-# Werner:
-# That is an OpenPGP notation name not registered with IANA.
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
+#~ 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"
+#~ "Otillräcklig mängd slumpdata tillgängliga. Jobba med andra saker\n"
+#~ "en stund för att ge operativsystemet en chans att samla mer entropi!\n"
+#~ "(Behöver %d fler byte)\n"
 
-# user notation name??
-# Werner:
-# That is an OpenPGP notation name not registered with IANA.
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
+#~ msgid "card reader not available\n"
+#~ msgstr "den hemliga nyckeln är inte tillgänglig"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "VARNING: ogiltig noteringsdata hittades\n"
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Du har signerat följande användaridentiteter:\n"
 
-#~ msgid "not human readable"
-#~ msgstr "inte möjlig att läsa för människor"
+#~ msgid "general error"
+#~ msgstr "allmänt fel"
+
+#~ msgid "unknown packet type"
+#~ msgstr "okänd pakettyp"
+
+#~ msgid "unknown version"
+#~ msgstr "okänd version"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "okänd algoritm för publik nyckel"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "okänd algoritm för beräkning av sammandrag"
+
+#~ msgid "bad public key"
+#~ msgstr "felaktig öppen nyckel"
+
+#~ msgid "bad secret key"
+#~ msgstr "felaktig hemlig nyckel"
+
+#~ msgid "bad signature"
+#~ msgstr "felaktig signatur"
+
+#~ msgid "checksum error"
+#~ msgstr "fel vid beräkning av kontrollsumma"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "okänd krypteringsalgoritm"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "kan inte öppna nyckelringen"
+
+#~ msgid "invalid packet"
+#~ msgstr "felaktigt paket"
+
+#~ msgid "invalid armor"
+#~ msgstr "felaktigt skal"
+
+#~ msgid "no such user id"
+#~ msgstr "okänd användaridentitet"
+
+#~ msgid "secret key not available"
+#~ msgstr "den hemliga nyckeln är inte tillgänglig"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "fel hemlig nyckel har använts"
+
+#~ msgid "not supported"
+#~ msgstr "inte stödd"
+
+#~ msgid "bad key"
+#~ msgstr "felaktig nyckel"
+
+#~ msgid "file read error"
+#~ msgstr "fel vid läsning av fil"
+
+#~ msgid "file write error"
+#~ msgstr "fel vid skrivning av fil"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "okänd komprimeringsalgoritm"
+
+#~ msgid "file open error"
+#~ msgstr "fel vid öppnande av fil"
+
+#~ msgid "file create error"
+#~ msgstr "fel vid skapande av fil"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "fel lösenmening"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "algoritmen för publik nyckel är inte införd"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "krypteringsalgorimten är inte införd"
+
+#~ msgid "unknown signature class"
+#~ msgstr "okänd signaturklass"
+
+#~ msgid "trust database error"
+#~ msgstr "fel i tillitsdatabasen"
+
+#~ msgid "resource limit"
+#~ msgstr "resursbegränsning"
+
+#~ msgid "invalid keyring"
+#~ msgstr "felaktig nyckelring"
+
+#~ msgid "malformed user id"
+#~ msgstr "felformaterad användaridentitet"
+
+#~ msgid "file close error"
+#~ msgstr "fel vid stängning av fil"
+
+#~ msgid "file rename error"
+#~ msgstr "fel vid namnbyte av fil"
+
+#~ msgid "file delete error"
+#~ msgstr "fel vid borttagande av fil"
+
+#~ msgid "unexpected data"
+#~ msgstr "oväntad data"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "konflikt mellan tidsstämplar"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "oanvändbar algoritm för publika nycklar"
+
+#~ msgid "file exists"
+#~ msgstr "filen finns"
+
+#~ msgid "weak key"
+#~ msgstr "svag nyckel"
+
+#~ msgid "invalid argument"
+#~ msgstr "felaktigt argument"
+
+#~ msgid "bad URI"
+#~ msgstr "felaktig URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "denna URI stöds inte"
+
+#~ msgid "network error"
+#~ msgstr "nätverksfel"
+
+#~ msgid "not encrypted"
+#~ msgstr "inte krypterad"
+
+#~ msgid "not processed"
+#~ msgstr "inte behandlade"
+
+#~ msgid "unusable public key"
+#~ msgstr "oanvändbar öppen nyckel"
+
+#~ msgid "unusable secret key"
+#~ msgstr "oanvändbar hemlig nyckel"
+
+#~ msgid "keyserver error"
+#~ msgstr "nyckelserverfel"
+
+#, fuzzy
+#~ msgid "no card"
+#~ msgstr "inte krypterad"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "ingen signerad data\n"
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... detta är ett fel i programmet (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "Varning: använder osäkert minne!\n"
+
+#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#~ msgstr "se http://www.gnupg.org/faq.html för mer information\n"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "operationen är inte möjlig utan tillgång till säkert minne\n"
+
+#~ 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"
+
+#~ msgid ""
+#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ msgstr "Mer information finns på: http://www.gnupg.org/why-not-idea.html\n"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6622,10 +8250,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#, fuzzy
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "fel vid skapandet av lösenmening: %s\n"
-
 #~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 #~ msgstr "Fel lösenmening eller okänd krypteringsalgoritm (%d)\n"
 
@@ -6640,18 +8264,9 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "kan inte få server-skriv FD för GPG-Agent\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "problem vid kommunikation med GPG-Agent\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "lösenmeningen är för lång\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "felaktigt svar från GPG-Agent\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n"
-
 #~ msgid "select secondary key N"
 #~ msgstr "välj undernyckel N"
 
@@ -6890,19 +8505,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "En-Armor a file or stdin"
 #~ msgstr "Skapa ett skal för en fil eller standard in"
 
-#~ msgid "|NAME|use NAME as default recipient"
-#~ msgstr "|NAMN|använd NAMN som förvald mottagare"
-
-#~ msgid "use the default key as default recipient"
-#~ msgstr "använd standardnyckeln som förvald mottagare"
-
-#~ msgid "don't use the terminal at all"
-#~ msgstr "använd inte terminalen alls"
-
-# Alltså även för V4-nycklar. För att vara PGP-kompatibel.
-#~ msgid "force v3 signatures"
-#~ msgstr "använd alltid v3-signaturer"
-
 # motsatsen översatt med:
 # använd alltid v3-signaturer
 #~ msgid "do not force v3 signatures"
@@ -6914,11 +8516,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "do not force v4 key signatures"
 #~ msgstr "genomdriv inte användning av v4-nyckelsignaturer"
 
-# Framtvingar användning av mdc även vid äldre chiffer. Ej kompatibelt med pgp.
-# Cast-5 används som standard  vid symmetrisk kryptering. Detta kommando integritetskyddar då den krypterade filen. Onödigt om nyare chiffer angivits med --personal-cipher-preferences
-#~ msgid "always use a MDC for encryption"
-#~ msgstr "använd alltid en MDC vid kryptering"
-
 # mdc är standard för de nyare algoritmerna AES, TWOFISH
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "använd aldrig en MDC vid kryptering"
@@ -6927,39 +8524,12 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "use the gpg-agent"
 #~ msgstr "använd GPG-Agent"
 
-#~ 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 över nyckelringar"
-
-#~ msgid "add this secret keyring to the list"
-#~ msgstr "lägg till denna hemliga nyckelring till listan"
-
-#~ 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 "|[file]|write status info to file"
 #~ msgstr "|[fil]|skriv statusinformation till fil"
 
 #~ msgid "|KEYID|ultimately trust this key"
 #~ msgstr "|NYCKELID|lita förbehållslöst 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"
 
@@ -6982,15 +8552,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "|NAME|use cipher algorithm NAME for passphrases"
 #~ msgstr "|NAMN|använd krypteringsalgoritmen NAMN för lösenmeningar"
 
-#~ msgid "|NAME|use cipher algorithm NAME"
-#~ msgstr "|NAMN|använd krypteringsalgoritmen NAMN"
-
-#~ msgid "|NAME|use message digest algorithm NAME"
-#~ msgstr "|NAMN|använd kontrollsummealgoritmen NAMN"
-
-#~ msgid "|N|use compress algorithm N"
-#~ msgstr "|N|använd komprimeringsalgoritmen N"
-
 #~ msgid "throw keyid field of encrypted packets"
 #~ msgstr "släng bort nyckelidentitetsfältet från krypterade paket"
 
@@ -7011,11 +8572,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "compress algorithm must be in range %d..%d\n"
 #~ msgstr "kompressionsalgoritmen måste vara i intervallet %d..%d\n"
 
-# Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
-# fixa en patch?
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "kan inte öppna %s: %s\n"
-
 #~ msgid "key %08lX: key has been revoked!\n"
 #~ msgstr "nyckeln %08lX: nyckeln har spärrats!\n"
 
@@ -7108,10 +8664,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- hittade förfalskad spärr av nyckeln\n"
 
-# betydelse?
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? problem vid kontroll av spärren: %s\n"
-
 #~ msgid ""
 #~ "\"\n"
 #~ "locally signed with your key %08lX at %s\n"
@@ -7141,9 +8693,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "can't get key from keyserver: %s\n"
 #~ msgstr "kan inte hämta nyckeln från en nyckelserver: %s\n"
 
-#~ msgid "error sending to `%s': %s\n"
-#~ msgstr "fel vid sändning till \"%s\": %s\n"
-
 #~ msgid "success sending to `%s' (status=%u)\n"
 #~ msgstr "lyckades sända till \"%s\" (status=%u)\n"
 
@@ -7208,9 +8757,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr ""
 #~ "kontrollerar vid djupet %d signerad=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: kan inte skapa katalog: %s\n"
-
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr "Om du vill använda denna spärrade nyckel ändå, svara \"ja\"."
 
@@ -7284,11 +8830,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "kan inte göra detta i batch-läge\n"
 
-# Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
-# fixa en patch?
-#~ msgid "can't open file: %s\n"
-#~ msgstr "Kan inte öppna fil: %s\n"
-
 # Det ska vara ett kolon på denna plats, men det saknas!
 #~ msgid "error: missing colon\n"
 #~ msgstr "fel: kolonet saknas\n"
diff --git a/po/tr.po b/po/tr.po
index ceb9b53a8..665ab5faa 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2005-03-16 07:30+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -15,293 +15,723 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "pbits=%u qbits=%u ile bir asal sayı üretilemez\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
-msgstr "%d bitten daha küçük bir asal sayı ürtilemez\n"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "rasgele bayt elde etme modülü bulunamadı\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "`%s' kiltlenemedi\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "satır çok uzun"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "Parola çok uzun\n"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "Ad ve soyadınızda geçersiz karakter var\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "MPI hatalı"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "anahtar parolası hatalı"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "anahtar parolası hatalı"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "gizli anahtarı `%s'e yazıyor\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "koruma algoritması %d desteklenmiyor\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "\"%s\" oluşturulamıyor: %s\n"
+
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "`%s' durumlanamıyor: %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "seri numarası alınırken hata: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' düzenli bir dosya değil - görülmedi\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "not: \"random_seed\" dosyası boş\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "UYARI: random_seed dosyasının boyu hatalı - kullanılmadı\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "\"%s\" okunamıyor: %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "anahtar okuması başarısız\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "\"%s\" oluşturulamıyor: %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "\"%s\" yazılamıyor: %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "\"%s\" kapatılamıyor: %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: nitelemeli tablo oluşturulamadı: %s\n"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli değil!!\n"
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "|A|Yönetici PIN'i"
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "Bu PIN'i tekrarlayın: "
+
+#: agent/divert-scd.c:278
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
+
+#: agent/divert-scd.c:290
+#, fuzzy, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "PIN [yapılan imza: %lu]"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
-"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"
+"Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "anahtar parolasını değiştirir"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "anahtar parolasını değiştirir"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Seçenekler:\n"
+" "
+
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
 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/rndlinux.c:132
-#, c-format
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "çok detaylı"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "daha az detaylı"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "bir anahtar sunucusunda anahtarları arar"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "güvence veritabanını günceller"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "anahtar parolası oluşturulurken hata: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr ""
+"Yazılım hatalarını lütfen <[email protected]> adresine,\n"
+"çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\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"
 
-#: g10/app-openpgp.c:596
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "parmakizinin saklanması başarısız oldu: %s\n"
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:609
+#: agent/gpg-agent.c:303
 #, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:977
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "anahtar okuması başarısız\n"
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#, c-format
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
-msgstr "yanıt genel anahtar verisi içermiyor\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
-msgstr "yanıt RSA modülü içermiyor\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
-msgstr "yanıt RSA genel bileşenini içermiyor\n"
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
 #, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "PIN eylemcisi hata döndürdü: %s\n"
+msgid "reading options from `%s'\n"
+msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
+msgid "error creating `%s': %s\n"
+msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
 #, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
-msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
-msgstr "karttan CHV durumu alınırken hata\n"
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
-msgstr "kart kalıcı olarak kilitli!\n"
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "\"%s\" adresine gönderme hatası: %s\n"
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "güncelleme başarısız: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "gizli anahtarı `%s'e yazıyor\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgid "directory `%s' created\n"
+msgstr "dizin `%s' oluşturuldu\n"
+
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "fstat(%d) %s de başarısız: %s\n"
+
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "%s: dizin oluşturulamıyor: %s\n"
+
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
-"kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
-msgstr "|A|Yönetici PIN'i"
+#: agent/gpg-agent.c:1432
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
-msgstr "|AN|Yeni Yönetici PIN'i"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
-msgstr "|N|Yeni PIN"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, fuzzy, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "gizliyi güncelleme başarısız: %s\n"
+
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: atlandı: %s\n"
+
+#: agent/gpg-agent.c:1650
+#, fuzzy
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
+
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "yeni PIN alınırken hata: %s\n"
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
-msgid "error reading application data\n"
-msgstr "uygulama verisi okunurken hata\n"
+#: agent/preset-passphrase.c:100
+#, fuzzy
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
-msgid "error reading fingerprint DO\n"
-msgstr "parmakizi DO okunurken hata\n"
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
-msgid "key already exists\n"
-msgstr "anahtar zaten mevcut\n"
+#: agent/protect-tool.c:146
+#, fuzzy
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
-msgstr "mevcut anahtar konulacak\n"
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1568
-msgid "generating new key\n"
-msgstr "yeni anahtar üretiliyor\n"
+#: agent/protect-tool.c:1206
+#, fuzzy
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "anahtar parolası hatalı"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "anahtar parolası oluşturulurken hata: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "iptal edildi"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "'%s' de hata: %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "seçenek dosyası \"%s\": %s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:158
 #, fuzzy, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "genel üs çok büyük (32 bitten fazla)\n"
+msgid "system trustlist `%s' not available\n"
+msgstr "gizli anahtar parçaları kullanım dışı\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "`%s' için okuma hatası: %s\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
+msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
-#, c-format
-msgid "failed to store the key: %s\n"
-msgstr "anahtarın saklanması başarısız: %s\n"
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
-msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1901
-msgid "generating key failed\n"
-msgstr "anahtar üretimi başarısızlığa uğradı\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
 #, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
+#: agent/trustlist.c:453
+#, fuzzy
+msgid "Yes"
+msgstr "evet"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:279 common/exechelp.c:370
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s imzası, %s özümleme algoritması\n"
+msgid "error creating a pipe: %s\n"
+msgstr "anahtar parolası oluşturulurken hata: %s\n"
+
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "dosya açılamadı: %s\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:446
 #, fuzzy, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "PIN [yapılan imza: %lu]"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "\"%s\" okunurken hata: %s\n"
+
+#: common/exechelp.c:487
+#, c-format
+msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "\"%s\" okunurken hata: %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "`%s' oluşturulurken hata: %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[Kullanıcı kimliği yok]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent bu oturumda kullanılamaz\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
+msgid "can't connect to `%s': %s\n"
+msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr "gpg-agent ile haberleşme problemi\n"
+
+#: common/simple-pwquery.c:389
+#, fuzzy
+msgid "problem setting the gpg-agent options\n"
+msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "kullanıcı tarafından durduruldu\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "evet"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "eE"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "hayır"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "hH"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "çık"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "çÇ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr "tamam|tamam"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr "iptal|iptal"
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr "tT"
+
+#: common/yesno.c:115
+msgid "cC"
+msgstr "iİ"
 
 #: g10/armor.c:320
 #, c-format
@@ -378,163 +808,200 @@ msgstr ""
 "zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
 "sunucusu kullanılmış\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
+"sonuna bir '=' gelir.\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
+
+#: g10/build-packet.c:962
+#, fuzzy
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "insan okuyabilir değil"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr "erkek"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr "dişi"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "belirtilmemiş"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Hata: İsimler birlikte çok uzun oluyor (sınır: %d karakter).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 msgid "Error: invalid response.\n"
 msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -545,193 +1012,139 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "bilinmeyen anahtar koruma algoritması\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "bunu gösterir"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "kart sahibinin ismini değiştirir"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "dil tercihlerini değiştirir"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "kart sahibinin cinsiyetini değiştirir"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "bir CA parmakizini değiştirir"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "PIN değiştirmek için menü"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "gizli anahtar kullanışsız"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
-"Lüthen kartı yerleştirdikten sonra ya <enter> ya da iptal için 'c' tuşlayın: "
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "anahtar bloğu silinemedi: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-"Mevcut kartı kaldırdıktan sonra lütfen seri numarası\n"
-"   %.*s\n"
-"olan kartı yerleştirin.\n"
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr "Hazır olunca <enter> ya da iptal etmek için 'c' tuşlayın: "
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr "Yeni Yönetici PIN'ini girin: "
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr "Yeni PIN'i girin: "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr "Yönetici PIN'ini girin: "
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr "PIN'i girin: "
-
-#: g10/cardglue.c:937
-msgid "Repeat this PIN: "
-msgstr "Bu PIN'i tekrarlayın: "
-
-#: g10/cardglue.c:952
-msgid "PIN not correctly repeated; try again"
-msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output seçeneği bu komutla çalışmaz\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -771,47 +1184,47 @@ msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 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"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s şifrelemesi kullanılıyor\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
 "yapabilirsiniz\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 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:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -819,7 +1232,7 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -828,166 +1241,201 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, 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"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 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:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "şifreli paketin elde edilmesinde sorun var\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "uzaktan uygulama çalıştırılması desteklenmiyor\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "`%s' dizini oluşturulamıyor: %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 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:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "bu platformda, dış uygulamalar çalıştırılırken geçici dosyalar gerekiyor\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr " '%s' çalıştırılamıyor: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "'%s' kabuğu çalıştırılamıyor: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, 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:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "Dış uygulamamnın doğal olmayan çıkışı\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "dış uygulama çalıştırılamıyor\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "dış uygulamanın yanıtı okunamıyor: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, 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:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "gizli anahtar kullanımdışı"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 msgid "exporting secret keys not allowed\n"
 msgstr "gizli anahtarların ihracına izin verilmez\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "anahtar %s: korunmamış - atlandı\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
+
+#: g10/getkey.c:176
+msgid "[User ID not found]"
+msgstr "[Kullanıcı kimliği yok]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+"Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr ""
+"yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n"
+
+#: g10/getkey.c:2612
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
+
+#: g10/getkey.c:2659
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -995,127 +1443,128 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1125,51 +1574,47 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "çok detaylı"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1622,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1197,17 +1642,17 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Yazılım hatalarını lütfen <[email protected]> adresine,\n"
 "çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1217,7 +1662,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1225,627 +1670,567 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "seçenek dosyası \"%s\": %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "\"%s\"den seçenekler okunuyor\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2826
-#, fuzzy, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent bu oturumda kullanılamaz\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 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/gpg.c:2986
+#: g10/gpg.c:3010
 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/gpg.c:2988
+#: g10/gpg.c:3012
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, 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ılamaz\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, 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ılamaz\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
-
-#: g10/getkey.c:175
-msgid "[User ID not found]"
-msgstr "[Kullanıcı kimliği yok]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr ""
-"Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr ""
-"yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n"
-
-#: g10/getkey.c:2611
-#, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
-
-#: g10/getkey.c:2658
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "daha az detaylı"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "anahtarlar bu anahtarlıktan alınır"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1853,7 +2238,7 @@ msgstr ""
 "Kullanımı: gpg [seçenekler] [dosyalar]\n"
 "Bilinen güvenli anahtarlara göre imzaları kontrol eder\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1864,7 +2249,7 @@ msgstr ""
 "bunun (açıkça belirtilmeden oluşturulmuş) sertifikalar ağıyla\n"
 "hiçbir alakası yok."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1877,18 +2262,18 @@ msgstr ""
 "bildirilmesi gerekir. \"evet\" yanıtı bu anahtarın son derece güvenli\n"
 "olduğunun belirtilmesi için yeterlidir.\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 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."
 
-#: g10/helptext.c:66
+#: 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:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1912,7 +2297,7 @@ msgstr ""
 "\n"
 "İlk (asıl) anahtar daima imzalama yeteneğine sahip bir anahtar olmalıdır."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1922,16 +2307,16 @@ msgstr ""
 "değildir. Bu algoritma sadece belli alanlarda kullanılabilir.\n"
 "Lütfen güvenlik uzmanınıza danışın."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Anahtar uzunluğunu giriniz"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Cevap \"evet\" ya da \"hayır\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1942,20 +2327,20 @@ msgstr ""
 "iyi bir hata cevabı alamazsınız -- onun yerine sistem verilen değeri\n"
 "bir zaman aralığı olarak çözümlemeyi dener."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Anahtar tutucunun ismini giriniz"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye edilir)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Lütfen önbilgi girin (isteğe bağlı)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1969,11 +2354,11 @@ msgstr ""
 "D anahtar üretimine Devam etmek için.\n"
 "K anahtar üretiminden çıKmak için."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Yardımcı anahtarı üretmek istiyorsanız \"evet\" ya da \"e\" girin."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:150
 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"
@@ -2035,13 +2420,13 @@ msgstr ""
 "kontroller arasındaki ayrıma siz karar vereceksiniz.\n"
 "Bu kararı verebilecek durumda değilseniz \"0\" cevabını verin."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "Kullanıcı kimliklerinin TÜMünü imzalamak istiyorsanız \"evet\" ya da \"yes\" "
 "yazın"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2049,11 +2434,11 @@ msgstr ""
 "Bu kullanıcı kimliğini gerçekten silmek istiyorsanız \"evet\" girin.\n"
 "Böylece bütün sertifikaları kaybedeceksiniz!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Bu yardımcı anahtarı silme izni vermek istiyorsanız \"evet\" girin"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2063,7 +2448,7 @@ msgstr ""
 "sertifikalanmış bir diğer anahtara bir güvence bağlantısı sağlamakta\n"
 "önemli olabileceğinden normalde bu imzayı silmek istemezsiniz."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2075,13 +2460,13 @@ msgstr ""
 "ertelemelisiniz çünkü bu imzalama anahtarı başka bir sertifikalı\n"
 "anahtar vasıtası ile bir güvence bağlantısı sağlayabilir."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "İmza geçersiz. Onu anahtar zincirinizden kaldırmak uygun olacak."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2094,7 +2479,7 @@ msgstr ""
 "Bunu sadece, eğer bu öz-imza bazı durumlarda geçerli değilse ya da\n"
 "kullanılabilir bir ikincisi var ise yapın."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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"
@@ -2104,23 +2489,23 @@ msgstr ""
 "listesine çevirir. Tüm etkilenen öz-imzaların zaman damgaları bir sonraki\n"
 "tarafından öne alınacaktır.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Lütfen son parolayı tekrarlayarak ne yazdığınızdan emin olun."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "İmzanın uygulanacağı dosyanın ismini verin"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Dosyanın üzerine yazılacaksa lütfen \"evet\" yazın"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2128,7 +2513,7 @@ msgstr ""
 "Lütfen yeni dosya ismini girin. Dosya ismini yazmadan RETURN tuşlarsanız\n"
 "parantez içinde gösterilen öntanımlı dosya kullanılacak."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2156,7 +2541,7 @@ msgstr ""
 "\tKullanıcı kimliği artık kullanılamayacak durumdaysa bunu\n"
 "\tseçin; genelde Eposta adresi geçersiz olduğunda kullanılır.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2166,11 +2551,11 @@ msgstr ""
 "verdiğinizi açıklayan bir metin girebilirsiniz.\n"
 "Lütfen bu metin kısa olsun. Bir boş satır metni bitirir.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "yardım mevcut değil"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
@@ -2206,502 +2591,497 @@ msgstr "gizli anahtar kullanımdışı"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d. tür blok atlandı\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "şu ana kadar %lu anahtar işlendi\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "İşlenmiş toplam miktar: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      alınan: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   değişmedi: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             alınamadı: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, fuzzy, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr "UYARI: anahtar %s kullanılabilir olmayan tercihler içeriyor\n"
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "Bu kullanıcı kimlikler için algoritmalar:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": özümleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 "         \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
 "\n"
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "tercihlerinizi güncellemenizi ve\n"
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
 "tekrar dağıtmanızı şiddetle öneririz.\n"
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 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:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %s: genel anahtar yok: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "anahtar %s: yeni anahtar - atlandı\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %s: \"%s\" değişmedi\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %s: gizli anahtar alındı\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "anahtar %s: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "anahtar %s: gizli anahtar yok: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %s: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %s alınıyor\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "`%s' anahtar zinciri oluşturuldu\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2712,17 +3092,17 @@ msgstr ""
 "derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n"
 "kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Şöyle böyle güveniyorum\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Tamamen güveniyorum\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2732,46 +3112,46 @@ msgstr ""
 "1'den büyük bir derinlik, imzaladığınız anhatarın kendi yararınıza\n"
 "güvence imzaları yapmayı mümkün kılar.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2780,11 +3160,11 @@ msgstr ""
 "\"%s\" üzerindeki öz-imza\n"
 "bir PGP 2.x tarzı imza.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 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) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2793,12 +3173,12 @@ msgstr ""
 "\"%s\" üzerindeki imzanızın\n"
 "kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 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:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2807,44 +3187,44 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:890
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2852,11 +3232,11 @@ msgstr ""
 "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2865,31 +3245,31 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2899,76 +3279,76 @@ msgstr ""
 "gerçekten\n"
 "emin misiniz?\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr "Bu bir öz-imza olacak.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
 "değiştirilecek bir anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2976,13 +3356,13 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2990,192 +3370,192 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 msgid "Do you really want to do this? (y/N) "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 msgid "show key fingerprint"
 msgstr "parmakizini gösterir"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "select subkey N"
 msgstr "N yardımcı anahtarını"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 msgid "check signatures"
 msgstr "imzaları sınar"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 msgid "sign selected user IDs locally"
 msgstr "kullanıcı kimlikleri yerel olarak imzalar"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "sign selected user IDs with a trust signature"
 msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 msgid "delete selected user IDs"
 msgstr "seçili kullanıcı kimlikleri siler"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 msgid "add a subkey"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr "bir akıllı karta bir anahtar ekler"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr "bir akıllı karttan bir anahtarı taşır"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 msgid "delete selected subkeys"
 msgstr "seçili yardımcı anahtarları siler"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 msgid "delete signatures from the selected user IDs"
 msgstr "seçili kullanıcı kimliklerden imzaları siler"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
 "değiştirir"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr "seçili kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 msgid "toggle between the secret and public key listings"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 msgid "set preference list for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "Seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
 "belirler"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 msgid "revoke signatures on the selected user IDs"
 msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 msgid "revoke selected user IDs"
 msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 msgid "revoke key or selected subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 msgid "enable key"
 msgstr "anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 msgid "disable key"
 msgstr "anahtarı iptal eder"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr "seçili foto kimlikleri gösterir"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3187,240 +3567,240 @@ msgstr ""
 "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
 "(ltsign, tnrsign gibi).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "imza türü `%s' bilinmiyor\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 msgid "Really remove this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 msgid "You must select exactly one key.\n"
 msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr "Komut argüman olarak bir dosya ismi gerektiriyor\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 msgid "Really revoke this user ID? (y/N) "
 msgstr ""
 "Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr ""
 "Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
 "da y/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 "Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 "(e/H ya da y/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr ""
 "Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
 "sahibiningüvencesi belirlenemez\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 msgid "Set preference list to:\n"
 msgstr "Belirlenecek tercih listesi:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
 "musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr "Niteleme: "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 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"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3428,17 +3808,17 @@ 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"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3447,7 +3827,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3456,55 +3836,55 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "geçersiz zırh"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3514,372 +3894,377 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 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:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 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"
 
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3413
 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"
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 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:3459
+#: g10/keyedit.c:3460
 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 ya da y/N) "
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, 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"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 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) "
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, 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:4922
+#: g10/keyedit.c:4923
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
 "gösteriliyor\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "'%s' tercihi yinelendi\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "çok fazla özümleme tercihi\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "çok fazla sıkıştırma tercihi\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr "İmzalama"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 msgid "Encrypt"
 msgstr "Şifreleme"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr "Kimlik kanıtlama"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr "İiŞşKkçÇ"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "bir %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr "Şimdilik mümkün eylemler: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA anahtar çifti %u bit olacak.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3895,7 +4280,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3911,38 +4296,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3950,11 +4335,11 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3970,44 +4355,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4018,7 +4403,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 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"
@@ -4034,24 +4419,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1997
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4059,12 +4444,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -4076,7 +4461,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4089,50 +4474,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4140,19 +4525,19 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4160,31 +4545,31 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "asla    "
 
@@ -4212,620 +4597,593 @@ msgstr "imza niteleyici: "
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 msgid "      Key fingerprint ="
 msgstr "     Anahtar parmakizi ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr "      Kart seri no. ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "UYARI: gizli bilgi içeren 2 dosya mevcut.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s değişmeyenlerden\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s yenilerden\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Lütfen bu güvenlik çatlağını giderin\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "%s' anahtar zinciri arabellekleniyor\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluşturuldu\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "UYARI: anahtar sunucusu seçeneği `%s' bu platformda kullanımda değil\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr "iptal edildi"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 msgid "no keyserver action!\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s  %d sürümü eylemciyi desteklemiyor\n"
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 msgid "keyserver timed out\n"
 msgstr "anahtar sunucusu zamanaşımına uğradı\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu iç hatası\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "bilinmeyen özümleme algoritması ile üretilmiş anahtar parolası %d\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
 "oluşturuldu\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 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:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, c-format
 msgid "Signature made %s\n"
 msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' için %s de durum bilgisi alınamıyor: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) %s de başarısız: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "UYARI: deneysel %s genel anahtar algoritması kullanılıyor\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "UYARI: deneysel %s şifreleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "UYARI: deneysel %s özümleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " b = Daha fazla bilgi gerekli\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1106
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "\"%s\" dosyası var. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 msgid "Overwrite? (y/N) "
 msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: bilinmeyen sonek\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "Yeni dosya ismini giriniz"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "standart çıktıya yazıyor\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, 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:424
-#, c-format
-msgid "directory `%s' created\n"
-msgstr "dizin `%s' oluşturuldu\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent bu oturumda kullanılamaz\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
@@ -4889,7 +5247,7 @@ msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
 msgid "Repeat passphrase: "
 msgstr "Tekrar: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4903,38 +5261,34 @@ msgstr ""
 "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:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Foto kimliği için JPEG dosya ismini giriniz: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "JPEG dosyası `%s' açılamıyor: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Bu JPEG gerçekten büyük (%d bayt)!\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H ya da y/N)  "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "'%s' bir JPEG dosyası değil\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Bu foto doğru mu? (e/H/ç)? "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "foto kimliği gösterilemiyor!\n"
 
@@ -5212,61 +5566,56 @@ msgstr "geçerli adresler yok\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "`%s' oluşturulurken hata: %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Bağımsız imza.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Lütfen veri dosyasının ismini girin: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "imzalı veri yok\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonim alıcı: %s gizli anahtarı deneniyor ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "tamam, biz anonim alıcıyız.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK'in eski kodlaması desteklenmiyor\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "UYARI: %s şifre algoritması alıcı tercihlerinde yok\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "BİLGİ: %s gizli anahtarının %s tarihinde kullanım süresi doldu\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
@@ -5390,99 +5739,99 @@ msgstr "(açıklama verilmedi)\n"
 msgid "Is this okay? (y/N) "
 msgstr "Bu tamam mı? (e/H ya da y/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "gizli anahtar parçaları kullanım dışı\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "koruma algoritması %d%s desteklenmiyor\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "koruma algoritması %d desteklenmiyor\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Anahtar parolası geçersiz; lütfen tekrar deneyin"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 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"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 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"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "zayıf anahtar oluşturuldu - yeniden deneniyor\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, 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 "
 "denendi!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "UYARI: iletideki imza özümlemesi çelişkili\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "UYARI: yardımcı imzalama anahtarı %s geçersiz çapraz sertifikalamaya sahip\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "genel anahtar %s imzadan %lu saniye daha yeni\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "genel anahtar %s imzadan %lu saniye daha yeni.\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5490,54 +5839,54 @@ msgstr ""
 "anahtar %s bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "BİLGİ: %s imza anahtarının kullanım süresi %s sularında dolmuş\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, 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ı %s anahtarından "
 "kaynaklandığı sanılıyor\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "anahtar %s: anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "anahtar %s: yardımcı anahtarı garantileme imzası için yardımcı anahtar yok\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 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
+#: g10/sign.c:94
 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:107
+#: g10/sign.c:108
 #, 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"
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5545,7 +5894,7 @@ msgstr ""
 "UYARI: güvence adresi için %%lik uzatma imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5564,12 +5913,12 @@ msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s imza: \"%s\" den\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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 ayrık imza yapabilirsiniz\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5577,40 +5926,40 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) özümleme algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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 açık imzalama "
 "yapabilirsiniz\n"
 
-#: g10/sign.c:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\" atlandı: tekrarlanmış\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
 
@@ -5664,51 +6013,51 @@ msgstr "`%s' için okuma hatası: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, 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"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "güvence veritabanı işlemi çok uzun\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "'%s' erişilemiyor: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dizin yok!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "`%s' için kilit oluşturulamıyor\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "`%s' kiltlenemedi\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: güvence veritabanı oluşturuldu\n"
@@ -5717,78 +6066,78 @@ msgstr "%s: güvence veritabanı oluşturuldu\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: güvence veritabanı geçersiz\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nitelemeli tablo oluşturulamadı: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: sürüm kaydının yazılmasında hata: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "güvence veritabanı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bir güvence veritabanı dosyası değil\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: %lu kayıt numarası ile sürüm kaydı\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: dosya sürümü %d geçersiz\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: dizin kaydını yazma hatası: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kayıt sıfırlama başarısız: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kayıt ekleme başarısız: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 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"
@@ -5798,7 +6147,7 @@ msgstr ""
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "%d karakterden daha uzun metin satırları okunamıyor\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "girdi satırı %d karakterden daha uzun\n"
@@ -5967,7 +6316,7 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "güvence veritabanının sürüm kaydı güncellenemedi: yazma başarısız: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5977,345 +6326,1635 @@ msgstr ""
 "İ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:192
+#: g10/verify.c:195
 #, 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"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "genel hata"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "bilinmeyen paket tipi"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "bilinmeyen sürüm"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "dosya açılamadı: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "bilinmeyen genel anahtar algoritması"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "bilinmeyen özümleme algoritması"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "genel anahtar hatalı"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "gizli anahtar hatalı"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr ""
+"Yazılım hatalarını lütfen <[email protected]> adresine,\n"
+"çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "imza hatalı"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "\"checksum\" hatası"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "anahtar parolası hatalı"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "genel anahtar bulunamadı"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "bilinmeyen şifre algoritması"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "anahtar zinciri açılamadı"
+#: scd/app-openpgp.c:609
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "geçersiz paket"
+#: scd/app-openpgp.c:1004
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "anahtar okuması başarısız\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "geçersiz zırh"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "böyle bir kullanıcı kimliği yok"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr "yanıt RSA modülü içermiyor\n"
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "gizli anahtar kullanışsız"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "yanlış gizli anahtar kullanılmış"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN eylemcisi hata döndürdü: %s\n"
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "desteklenmiyor"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "anahtar hatalı"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "dosya okuma hatası"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "dosya yazma hatası"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr "karttan CHV durumu alınırken hata\n"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "bilinmeyen sıkıştırma algoritması"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr "kart kalıcı olarak kilitli!\n"
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "dosya açma hatası"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr ""
+"kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\n"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "dosya oluşturma hatası"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr "|A|Yönetici PIN'i"
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "anahtar parolası geçersiz"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr "|AN|Yeni Yönetici PIN'i"
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "tamamlanmamış genel anahtar algoritması"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr "|N|Yeni PIN"
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "tamamlanmamış şifre algoritması"
+#: scd/app-openpgp.c:1535
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "yeni PIN alınırken hata: %s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "bilinmeyen imza sınıfı"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+msgid "error reading application data\n"
+msgstr "uygulama verisi okunurken hata\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "güvence veritabanı hatası"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+msgid "error reading fingerprint DO\n"
+msgstr "parmakizi DO okunurken hata\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "MPI hatalı"
+#: scd/app-openpgp.c:1601
+msgid "key already exists\n"
+msgstr "anahtar zaten mevcut\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "iç kaynak sınırı"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr "mevcut anahtar konulacak\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "anahtar zinciri geçersiz"
+#: scd/app-openpgp.c:1607
+msgid "generating new key\n"
+msgstr "yeni anahtar üretiliyor\n"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "sertifika hatalı"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr ""
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "kullanıcı kimliği bozuk"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "dosya kapama hatası"
+#: scd/app-openpgp.c:1788
+#, fuzzy, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "genel üs çok büyük (32 bitten fazla)\n"
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "dosya isim değiştirme hatası"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr ""
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "dosya silme hatası"
+#: scd/app-openpgp.c:1866
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "beklenmeyen veri"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "zaman damgası çelişkili"
+#: scd/app-openpgp.c:1939
+msgid "generating key failed\n"
+msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "genel anahtar algoritması kullanışsız"
+#: scd/app-openpgp.c:1942
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "dosya mevcut"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "anahtar zayıf"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "geçersiz argüman"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "URI hatalı"
+#: scd/app-openpgp.c:2184
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "PIN [yapılan imza: %lu]"
+
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "desteklenmeyen URI"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "ağ hatası"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "şifrelenemedi"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "işlenemedi"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "genel anahtar kullanımdışı"
+#: scd/scdaemon.c:122
+#, fuzzy
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "gizli anahtar kullanımdışı"
+#: scd/scdaemon.c:123
+#, fuzzy
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "anahtar sunucusu hatası"
+#: scd/scdaemon.c:126
+#, fuzzy
+msgid "do not use the internal CCID driver"
+msgstr "terminali hiç kullanma"
 
-#: util/errors.c:109
-msgid "canceled"
-msgstr "iptal edildi"
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
-msgid "no card"
-msgstr "kat yok"
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "yönetici komutlarını gösterir"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "imzalı veri yok\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: util/logger.c:158
-msgid "ERROR: "
-msgstr "HATA: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
-msgstr "UYARI: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... bu bir yazılım hatası (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "evet"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "geçersiz radix64 karakteri %02X atlandı\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "eE"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "`%s' açılamıyor: %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "gizli anahtarların ihracına izin verilmez\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "anahtarın saklanması başarısız: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "sertifika hatalı"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "Anahtar burada:"
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "bir yürürlükten kaldırma sertifikası üretir"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "Bu anahtarın kullanım süresi dolmuş!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "CA parmak izi: "
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "bir imzayı doğrular"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "hayır"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "hH"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "[belirtilmedi]"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "Hata: yanıt geçersiz.\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "Hata: yanıt geçersiz.\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+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 %s, oluşturma tarihi %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "`%s' hash algoritması geçersiz\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "geçerli bir E-posta adresi değil\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "gizli anahtar \"%s\" yok: %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "anahtar bloğu okunurken hata: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "'%s' tercihi yinelendi\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "anahtar bloğu silinemedi: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(açıklama verilmedi)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "anahtar parolası oluşturulurken hata: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: dizin kaydını yazma hatası: %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[dosya]|bir imza yapar"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "gizli anahtarları listeler"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "sertifika hatalı"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "anahtarları genel anahtar zincirinden siler"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "sertifika hatalı"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "sertifika hatalı"
+
+#: sm/gpgsm.c:263
+#, fuzzy
+msgid "register a smartcard"
+msgstr "bir akıllı karta bir anahtar ekler"
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "anahtar parolasını değiştirir"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "ascii zırhlı çıktı oluşturur"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
+
+#: sm/gpgsm.c:320
+msgid "use the default key as default recipient"
+msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr "terminali hiç kullanma"
+
+#: sm/gpgsm.c:341
+msgid "force v3 signatures"
+msgstr "v3 imzalarına zorlar"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr "şifreleme için daima bir MDC kullanılır"
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr "soruların çoğunda cevap evet farzedilir"
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr "soruların çoğunda cevap hayır farzedilir"
+
+#: sm/gpgsm.c:351
+msgid "add this keyring to the list of keyrings"
+msgstr "bu anahtar zincirini anahtar zincirleri listesine ekler"
+
+#: sm/gpgsm.c:352
+msgid "add this secret keyring to the list"
+msgstr "bu gizli anahtar zincirini listeye ekler"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
+
+#: sm/gpgsm.c:355
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
+
+#: sm/gpgsm.c:380
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
+
+#: sm/gpgsm.c:382
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
+
+#: sm/gpgsm.c:384
+msgid "|N|use compress algorithm N"
+msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\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"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "kullanımı: gpg [seçenekler] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "'%s' erişilemiyor: %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "İşlenmiş toplam miktar: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "bir yürürlükten kaldırma sertifikası üretir"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "seri numarası alınırken hata: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "\"%s\" okunurken hata: %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "`%s' anahtar zinciri oluşturuldu\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "parmakizinin saklanması başarısız oldu: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "anahtarın saklanması başarısız: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "seri numarası alınırken hata: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "seri numarası alınırken hata: %s\n"
+
+#: sm/keydb.c:1392
+#, fuzzy, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "yeni PIN alınırken hata: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "\"%s\" okunurken hata: %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "Hata: biçimli parmakizi geçersiz\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "İmza %s de\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "\"%s\" deki imza iyi"
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                nam-ı diğer \"%s\""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "çık"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "çÇ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
-msgstr "tamam|tamam"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
-msgstr "iptal|iptal"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
+msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
-msgstr "tT"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
+msgstr ""
 
-#: util/miscutil.c:411
-msgid "cC"
-msgstr "iİ"
+#: tools/gpg-connect-agent.c:126
+#, fuzzy
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "satır çok uzun"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "`%s' seçeneği bilinmiyor\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "imzalama başarısız: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "anahtar okuması başarısız\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "\"%s\" adresine gönderme hatası: %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "\"%s\" adresine gönderme hatası: %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "kullanımı: gpg [seçenekler] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "genel anahtar bulunamadı"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@Komutlar:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "Şifre çözme tamam\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "Şifre çözme tamam\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [dosyaismi]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "UYARI: kullanılan bellek güvenli değil!\n"
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "`%s' için %s de durum bilgisi alınamıyor: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, fuzzy, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr "%s açılamadı: %s\n"
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "\"%s\" okunurken hata: %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "'%s' de hata: %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "uzaktan uygulama çalıştırılması desteklenmiyor\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
-"Daha geniş bilgi edinmek için http://www.gnupg.org/faq.html adresine "
-"bakınız\n"
 
-#: util/secmem.c:351
-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"
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "\"%s\" oluşturulamıyor: %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "\"%s\" oluşturulamıyor: %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "güncelleme başarısız: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "anahtar bloğu silinemedi: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "güncelleme başarısız: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "güncelleme başarısız: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "güncelleme başarısız: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "dosya açılamadı: %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "koruma algoritması %d desteklenmiyor\n"
+
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "pbits=%u qbits=%u ile bir asal sayı üretilemez\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "%d bitten daha küçük bir asal sayı ürtilemez\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "rasgele bayt elde etme modülü bulunamadı\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "`%s' kiltlenemedi\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "gizli anahtarı `%s'e yazıyor\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "`%s' durumlanamıyor: %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' düzenli bir dosya değil - görülmedi\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "not: \"random_seed\" dosyası boş\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "UYARI: random_seed dosyasının boyu hatalı - kullanılmadı\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "\"%s\" okunamıyor: %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "\"%s\" yazılamıyor: %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "\"%s\" kapatılamıyor: %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli değil!!\n"
 
 #~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#~ "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 ""
-#~ "Daha fazla bilgi için lütfen http://www.gnupg.org/why-not-idea.html "
-#~ "adresine\n"
-#~ "bakınız.\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"
+#~ "\n"
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
+#~ "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 ""
-#~ "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
-#~ "sonuna bir '=' gelir.\n"
+#~ "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"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
+#~ 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"
+#~ "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"
 
 #, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
+#~ msgid "card reader not available\n"
+#~ msgstr "gizli anahtar kullanışsız"
+
+#~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
+#~ msgstr ""
+#~ "Lüthen kartı yerleştirdikten sonra ya <enter> ya da iptal için 'c' "
+#~ "tuşlayın: "
+
+#~ msgid ""
+#~ "Please remove the current card and insert the one with serial number:\n"
+#~ "   %.*s\n"
+#~ msgstr ""
+#~ "Mevcut kartı kaldırdıktan sonra lütfen seri numarası\n"
+#~ "   %.*s\n"
+#~ "olan kartı yerleştirin.\n"
+
+#~ msgid "Hit return when ready or enter 'c' to cancel: "
+#~ msgstr "Hazır olunca <enter> ya da iptal etmek için 'c' tuşlayın: "
+
+#~ msgid "Enter New Admin PIN: "
+#~ msgstr "Yeni Yönetici PIN'ini girin: "
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
+#~ msgid "Enter New PIN: "
+#~ msgstr "Yeni PIN'i girin: "
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
+#~ msgid "Enter Admin PIN: "
+#~ msgstr "Yönetici PIN'ini girin: "
 
-#~ msgid "not human readable"
-#~ msgstr "insan okuyabilir değil"
+#~ msgid "Enter PIN: "
+#~ msgstr "PIN'i girin: "
+
+#, fuzzy
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "gpg-agent bu oturumda kullanılamaz\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "Bu kullanıcı kimlikler için algoritmalar:\n"
+
+#~ msgid "general error"
+#~ msgstr "genel hata"
+
+#~ msgid "unknown packet type"
+#~ msgstr "bilinmeyen paket tipi"
+
+#~ msgid "unknown version"
+#~ msgstr "bilinmeyen sürüm"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "bilinmeyen genel anahtar algoritması"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "bilinmeyen özümleme algoritması"
+
+#~ msgid "bad public key"
+#~ msgstr "genel anahtar hatalı"
+
+#~ msgid "bad secret key"
+#~ msgstr "gizli anahtar hatalı"
+
+#~ msgid "bad signature"
+#~ msgstr "imza hatalı"
+
+#~ msgid "checksum error"
+#~ msgstr "\"checksum\" hatası"
+
+#~ msgid "unknown cipher algorithm"
+#~ msgstr "bilinmeyen şifre algoritması"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "anahtar zinciri açılamadı"
+
+#~ msgid "invalid packet"
+#~ msgstr "geçersiz paket"
+
+#~ msgid "invalid armor"
+#~ msgstr "geçersiz zırh"
+
+#~ msgid "no such user id"
+#~ msgstr "böyle bir kullanıcı kimliği yok"
+
+#~ msgid "secret key not available"
+#~ msgstr "gizli anahtar kullanışsız"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "yanlış gizli anahtar kullanılmış"
+
+#~ msgid "not supported"
+#~ msgstr "desteklenmiyor"
+
+#~ msgid "bad key"
+#~ msgstr "anahtar hatalı"
+
+#~ msgid "file read error"
+#~ msgstr "dosya okuma hatası"
+
+#~ msgid "file write error"
+#~ msgstr "dosya yazma hatası"
+
+#~ msgid "unknown compress algorithm"
+#~ msgstr "bilinmeyen sıkıştırma algoritması"
+
+#~ msgid "file open error"
+#~ msgstr "dosya açma hatası"
+
+#~ msgid "file create error"
+#~ msgstr "dosya oluşturma hatası"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "anahtar parolası geçersiz"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "tamamlanmamış genel anahtar algoritması"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "tamamlanmamış şifre algoritması"
+
+#~ msgid "unknown signature class"
+#~ msgstr "bilinmeyen imza sınıfı"
+
+#~ msgid "trust database error"
+#~ msgstr "güvence veritabanı hatası"
+
+#~ msgid "resource limit"
+#~ msgstr "iç kaynak sınırı"
+
+#~ msgid "invalid keyring"
+#~ msgstr "anahtar zinciri geçersiz"
+
+#~ msgid "malformed user id"
+#~ msgstr "kullanıcı kimliği bozuk"
+
+#~ msgid "file close error"
+#~ msgstr "dosya kapama hatası"
+
+#~ msgid "file rename error"
+#~ msgstr "dosya isim değiştirme hatası"
+
+#~ msgid "file delete error"
+#~ msgstr "dosya silme hatası"
+
+#~ msgid "unexpected data"
+#~ msgstr "beklenmeyen veri"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "zaman damgası çelişkili"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "genel anahtar algoritması kullanışsız"
+
+#~ msgid "file exists"
+#~ msgstr "dosya mevcut"
+
+#~ msgid "weak key"
+#~ msgstr "anahtar zayıf"
+
+#~ msgid "invalid argument"
+#~ msgstr "geçersiz argüman"
+
+#~ msgid "bad URI"
+#~ msgstr "URI hatalı"
+
+#~ msgid "unsupported URI"
+#~ msgstr "desteklenmeyen URI"
+
+#~ msgid "network error"
+#~ msgstr "ağ hatası"
+
+#~ msgid "not encrypted"
+#~ msgstr "şifrelenemedi"
+
+#~ msgid "not processed"
+#~ msgstr "işlenemedi"
+
+#~ msgid "unusable public key"
+#~ msgstr "genel anahtar kullanımdışı"
+
+#~ msgid "unusable secret key"
+#~ msgstr "gizli anahtar kullanımdışı"
+
+#~ msgid "keyserver error"
+#~ msgstr "anahtar sunucusu hatası"
+
+#~ msgid "no card"
+#~ msgstr "kat yok"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "imzalı veri yok\n"
+
+#~ msgid "ERROR: "
+#~ msgstr "HATA: "
+
+#~ msgid "WARNING: "
+#~ msgstr "UYARI: "
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... bu bir yazılım hatası (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "UYARI: kullanılan bellek güvenli değil!\n"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
+
+#~ 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 "
+#~ "adresine\n"
+#~ "bakınız.\n"
 
 #, fuzzy
 #~ msgid "all export-clean-* options from above"
@@ -6351,9 +7990,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "seri numarası alınırken hata: %s\n"
-
 #~ msgid "length of RSA modulus is not %d\n"
 #~ msgstr "RSA modülünün uzunluğu %d değildir\n"
 
@@ -6372,18 +8008,9 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid "can't get server write FD for the agent\n"
 #~ msgstr "sunucu yazma dosya tanıtıcısı alınamadı\n"
 
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "gpg-agent ile haberleşme problemi\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "Parola çok uzun\n"
-
 #~ msgid "invalid response from agent\n"
 #~ msgstr "yanıt geçersiz\n"
 
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
-
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "bu dağıtımda özümleme algoritması %s salt-okunurdur\n"
 
@@ -6425,18 +8052,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ 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"
 
@@ -6446,48 +8061,18 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ 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 "|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 "|[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"
 
@@ -6509,15 +8094,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ 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"
 
@@ -6542,9 +8118,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid "--nrlsign-key user-id"
 #~ msgstr "--nrlsign-key KULL-KML"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "%s açılamadı: %s\n"
-
 #~ msgid "key %08lX: key has been revoked!\n"
 #~ msgstr "anahtar %08lX: anahtar yürürlükten kaldırılmıştı!\n"
 
@@ -6770,9 +8343,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
 
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
-
 #~ msgid ""
 #~ "\"\n"
 #~ "locally signed with your key %08lX at %s\n"
@@ -6801,9 +8371,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\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"
 
@@ -6865,9 +8432,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ "denetim %d derinlikte yapılıyor: signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/"
 #~ "%d\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: dizin oluşturulamıyor: %s\n"
-
 #~ 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"
@@ -6937,9 +8501,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "pardon, bu betik kipinde yapılamaz\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "dosya açılamadı: %s\n"
-
 #~ msgid "error: missing colon\n"
 #~ msgstr "hata: \":\" eksik\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d53b336b9..97ce17d26 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -19,291 +19,722 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "当 pbits=%u 而 qbits=%u 时不能生成质数\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "无法存储指纹：%s\n"
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
-msgstr "少于 %d 位时不能生成质数\n"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "检测不到熵搜集模块\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: cipher/random.c:403
-#, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "无法锁定‘%s’：%s\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "列太长"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "列太长"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "姓名含有无效的字符\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "损坏的多精度整数(MPI)"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "错误的密码"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "错误的密码"
+
+#: agent/command-ssh.c:533
+#, fuzzy, c-format
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "不支持保护散列 %d\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
 #, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "等待‘%s’上的锁\n"
+msgid "can't create `%s': %s\n"
+msgstr "无法建立‘%s’：%s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "无法获得文件‘%s’的信息： %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "获取新 PIN 时出错：%s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "‘%s’不是一个普通文件――已忽略\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "注意：随机数种子文件为空\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "取得当前密钥信息时出错：%s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "警告：随机数种子文件大小无效――未使用\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "无法读取‘%s’：%s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "无法读出公钥：%s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "注意：随机数种子文件未被更新\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "无法建立‘%s’：%s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "无法写入‘%s’：%s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "无法关闭‘%s’：%s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s：建立散列表失败：%s\n"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "警告：正在使用不安全的随机数发生器！！\n"
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "|A|管理员 PIN"
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "再次输入此 PIN："
+
+#: agent/divert-scd.c:278
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN 再次输入时与首次输入不符；请再试一次"
+
+#: agent/divert-scd.c:290
+#, fuzzy, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
-"使用这个随机数字发生器纯粹是为了使程序编译通过──它\n"
-"根本就不是真正意义上的强随机数发生器！\n"
-"\n"
-"绝对不要在现实世界中使用这个程序产生的任何数据！！\n"
+"您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "更改密码"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "更改密码"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"选项：\n"
+" "
+
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
 msgstr ""
-"请稍待片刻，系统此时正在搜集熵。如果您觉得无聊的话，不妨做些\n"
-"别的事——事实上这甚至能够让熵数的品质更好。\n"
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "详细模式"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "尽量减少提示信息"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "从‘%s’读取选项\n"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "在公钥服务器上搜寻密钥"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "为所选用户标识的设定注记"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "导入后不更新信任度数据库"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "生成密码的时候发生错误：%s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr ""
+"请向 <[email protected]> 报告程序缺陷。\n"
+"请向 <[email protected]> 反映简体中文翻译的问题。\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
-"\n"
-"随机字节不够多。请再做一些其他的琐事，以使操作系统能搜集到更多的熵！\n"
-"(还需要%d字节)\n"
 
-#: g10/app-openpgp.c:596
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "无法存储指纹：%s\n"
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:609
+#: agent/gpg-agent.c:303
 #, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "无法存储创建日期：%s\n"
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:977
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
 #, c-format
-msgid "reading public key failed: %s\n"
-msgstr "无法读出公钥：%s\n"
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
-msgstr "响应未包含公钥数据\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
-msgstr "响应未包含 RSA 余数\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
-msgstr "响应未包含 RSA 公钥指数\n"
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "配置文件‘%s’：%s\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
 #, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "PIN 回调返回错误：%s\n"
+msgid "reading options from `%s'\n"
+msgstr "从‘%s’读取选项\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
+msgid "error creating `%s': %s\n"
+msgstr "建立‘%s’时发生错误：%s\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
 #, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "验证 CHV%d 失败：%s\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "无法建立目录‘%s’：%s\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
-msgstr "尚未配置管理员命令的权限\n"
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
-msgstr "从卡中获取 CHV 状态时出错\n"
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "无法建立‘%s’：%s\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
-msgstr "卡被永久锁定！\n"
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "更新失败：%s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "正在将私钥写至`%s'\n"
+
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
+msgid "directory `%s' created\n"
+msgstr "已创建目录‘%s’\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
-msgstr "|A|管理员 PIN"
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
-msgstr "|AN|新的管理员 PIN"
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "无法建立目录‘%s’：%s\n"
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
-msgstr "新的 PIN"
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1432
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "获取新 PIN 时出错：%s\n"
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
-msgid "error reading application data\n"
-msgstr "读取应用程序数据时出错\n"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
-msgid "error reading fingerprint DO\n"
-msgstr "读取指纹 D0 出错\n"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
-msgid "key already exists\n"
-msgstr "密钥已存在\n"
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, fuzzy, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "更新私钥失败：%s\n"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
-msgstr "现有的密钥将被替换\n"
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s：已跳过：%s\n"
 
-#: g10/app-openpgp.c:1568
-msgid "generating new key\n"
-msgstr "生成新密钥\n"
+#: agent/gpg-agent.c:1650
+#, fuzzy
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
-msgstr "缺少创建时间戳\n"
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: g10/app-openpgp.c:1742
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA 余数缺失或者不是 %d 位长\n"
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: g10/app-openpgp.c:1749
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "RSA 公钥指数缺失或长于 %d 位\n"
+#: agent/preset-passphrase.c:100
+#, fuzzy
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+
+#: agent/protect-tool.c:146
+#, fuzzy
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
+msgstr ""
+
+#: agent/protect-tool.c:1206
+#, fuzzy
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "请输入密码：这是一个秘密的句子 \n"
+
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "请输入密码：这是一个秘密的句子 \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+msgstr ""
+
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "请输入密码：这是一个秘密的句子 \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "错误的密码"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "生成密码的时候发生错误：%s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "已取消"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "‘%s’中出错：%s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "配置文件‘%s’：%s\n"
+
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "私钥部分不可用\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "读取‘%s’错误：%s\n"
 
-#: g10/app-openpgp.c:1827
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "failed to store the key: %s\n"
-msgstr "无法存储密钥：%s\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
-msgstr "请稍候，正在生成密钥……\n"
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/app-openpgp.c:1901
-msgid "generating key failed\n"
-msgstr "生成密钥失败\n"
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1904
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "密钥已生成(耗时 %d 秒)\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
+msgstr ""
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:2087
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
 #, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "卡不支持散列算法 %s\n"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
+
+#: agent/trustlist.c:453
+#, fuzzy
+msgid "Yes"
+msgstr "yes"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
+#, fuzzy, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "生成密码的时候发生错误：%s\n"
+
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "无法打开有签名的数据‘%s’\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "读取‘%s’时出错：%s\n"
+
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "目前已创建的签名：%lu\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
+
+#: common/exechelp.c:446
+#, fuzzy, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "取得当前密钥信息时出错：%s\n"
+
+#: common/exechelp.c:452 common/exechelp.c:492
+#, fuzzy, c-format
+msgid "error running `%s': exit status %d\n"
+msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/app-openpgp.c:2142
+#: common/exechelp.c:487
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
+msgid "error running `%s': probably not installed\n"
+msgstr ""
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
-msgstr "目前禁止通过此命令验证管理员 PIN\n"
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "读取‘%s’时出错：%s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "建立‘%s’时发生错误：%s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[找不到用户标识]"
+
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
+msgid "can't connect to `%s': %s\n"
+msgstr "无法连接至‘%s’：%s\n"
+
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr ""
+
+#: common/simple-pwquery.c:389
+msgid "problem setting the gpg-agent options\n"
+msgstr ""
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "用户取消\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "代理程序有问题――正在停用代理程序\n"
+
+#: common/sysutils.c:88 g10/misc.c:137
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "无法禁用核心内存转储：%s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "警告：扩展模块‘%s’所有权不安全\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "警告：扩展模块‘%s’权限不安全\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "yes"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "quit"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr "okay|ok"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:115
+msgid "cC"
+msgstr "cC"
 
 #: g10/armor.c:320
 #, c-format
@@ -378,163 +809,198 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr ""
+
+#: g10/build-packet.c:962
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr ""
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr ""
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+#, fuzzy
+msgid "WARNING: invalid notation data found\n"
+msgstr "找不到有效的 OpenPGP 数据。\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr ""
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "您的选择？ "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "未定义"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr "可选"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr "必须"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用 ASCII 字符。\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符“<”。\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr "卡持有人的姓："
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr "卡持有人的名："
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr "获取公钥的 URL："
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr "登录数据(帐号名)："
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr "个人 DO 数据："
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 msgid "Language preferences: "
 msgstr "首选语言："
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：首选项字符串长度无效。\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：首选项字符串里有无效字符。\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 msgid "CA fingerprint: "
 msgstr "CA 指纹："
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "针对密钥的操作无法实现：%s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -545,191 +1011,139 @@ msgstr ""
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签名密钥\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "不支持的密钥保护算法\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "更改获取密钥的 URL"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "设定 PIN 签名是否必须"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "命令> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "私钥不可用"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr "请插入卡并回车，或输入‘c’来取消："
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "删除密钥区块时失败：%s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-"请取出当前的卡，并插入有下列序列号的卡：\n"
-"  %.*s\n"
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr "就绪后请回车，或输入‘c’取消"
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr "输入新的管理员 PIN："
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr "输入新的 PIN："
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr "输入管理员 PIN："
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr "输入 PIN："
-
-#: g10/cardglue.c:937
-msgid "Repeat this PIN: "
-msgstr "再次输入此 PIN："
-
-#: g10/cardglue.c:952
-msgid "PIN not correctly repeated; try again"
-msgstr "PIN 再次输入时与首次输入不符；请再试一次"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output 在这个命令中不起作用\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -769,210 +1183,243 @@ msgstr "公钥“%s”有对应的私钥！\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "使用对称加密算法 %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "正在从‘%s’读取\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "您正要用来加密的所有密钥都不能使用 IDEA 算法。\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "您不该将 %s 用于 %s 模式中\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "处理加密包有问题\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "不支持远程调用\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "无法建立目录‘%s’：%s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "由于配置文件权限不安全，外部程序调用被禁用\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "在这个操作平台上调用外部程序时需要临时文件\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "无法执行程序‘%s’：%s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "无法在命令解释环境中执行‘%s’：%s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "调用外部程序时发生系统错误：%s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "外部程序异常退出\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "无法执行外部程序\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "无法读取外部程序响应：%s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 msgid "export signatures that are marked as local-only"
 msgstr "导出被标记为局部的密名"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "导出属性用户标识(一般为照片标识)"
 
-#: g10/export.c:65
+#: g10/export.c:67
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "导出被标记为“敏感”的吊销密钥"
 
-#: g10/export.c:67
+#: g10/export.c:69
 msgid "remove the passphrase from exported subkeys"
 msgstr "从导出的子钥中删除所有密码"
 
-#: g10/export.c:69
+#: g10/export.c:71
 msgid "remove unusable parts from key during export"
 msgstr "导出时清除密钥中的不可用部分"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr "导出时尽可能清除密钥中的可选部分"
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 msgid "exporting secret keys not allowed\n"
 msgstr "不允许导出私钥\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "密钥 %s：未被保护――已跳过\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "密钥 %s：密钥在卡上——已跳过\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr "准备导出一把不受保护的子钥\n"
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "无法取消保护子钥：%s\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "pk 缓存里项目太多――已禁用\n"
+
+#: g10/getkey.c:176
+msgid "[User ID not found]"
+msgstr "[找不到用户标识]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr "自动获取‘%s’，通过 %s\n"
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "公钥 %s 没有相对应的私钥――忽略\n"
+
+#: g10/getkey.c:2612
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "使用子钥 %s 而非主钥 %s\n"
+
+#: g10/getkey.c:2659
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -980,127 +1427,128 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "列出密钥和签名"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "为某把密钥添加签名"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签名"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签名"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1110,51 +1558,47 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "详细模式"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1162,7 +1606,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1182,17 +1626,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1202,7 +1646,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1210,617 +1654,559 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "注意：没有默认配置文件‘%s’\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "配置文件‘%s’：%s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "从‘%s’读取选项\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2826
-#, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "注意：%s 本版本中不可用\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:2986
+#: g10/gpg.c:3010
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:3012
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "pk 缓存里项目太多――已禁用\n"
-
-#: g10/getkey.c:175
-msgid "[User ID not found]"
-msgstr "[找不到用户标识]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr "自动获取‘%s’，通过 %s\n"
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "公钥 %s 没有相对应的私钥――忽略\n"
-
-#: g10/getkey.c:2611
-#, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "使用子钥 %s 而非主钥 %s\n"
-
-#: g10/getkey.c:2658
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "尽量减少提示信息"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "从这个钥匙环里取用密钥"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳矛盾仅视为警告"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法：gpgv [选项] [文件] (用 -h 求助)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1828,7 +2214,7 @@ msgstr ""
 "语法：gpg [选项] [文件]\n"
 "用已知的受信任密钥来检查签名\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1837,7 +2223,7 @@ msgstr ""
 "在这里指定的数值完全由您自己决定；这些数值永远不会被输出给任何第三方。\n"
 "我们需要它来实现“信任网络”；这跟隐含建立起来的“验证网络”无关。"
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1847,16 +2233,16 @@ msgstr ""
 "要建立起信任网络，GnuPG 需要知道哪些密钥是可绝对信任的――通常\n"
 "就是您拥有私钥的那些密钥。回答“yes”将此密钥设成可绝对信任的\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果您无论如何要使用这把未被信任的密钥，请回答“yes”。"
 
-#: g10/helptext.c:66
+#: g10/helptext.c:68
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "输入您要递送的报文的接收者的用户标识。"
 
-#: g10/helptext.c:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1879,7 +2265,7 @@ msgstr ""
 "\n"
 "第一把密钥(主钥)必须具有签名的能力。"
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1888,16 +2274,16 @@ msgstr ""
 "通常来说用同一把密钥签名及加密并不是个好主意。这个算法只在特定的情况\n"
 "下使用。请先咨询安全方面的专家。"
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "请输入密钥的尺寸"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "请回答“yes”或“no”"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1908,19 +2294,19 @@ msgstr ""
 "您可以输入 ISO 日期格式(YYYY-MM-DD)，但是出错时您不会得到友好的响应\n"
 "――系统会尝试将给定值解释为时间间隔。"
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "请输入密钥持有人的名字"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "请输入电子邮件地址(可选项，但强烈推荐使用)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "请输入注释(可选项)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1934,11 +2320,11 @@ msgstr ""
 "O  继续产生密钥。\n"
 "Q  中止产生密钥。"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "如果您允许生成子钥，请回答“yes”(或者“y”)。"
 
-#: g10/helptext.c:148
+#: g10/helptext.c:150
 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"
@@ -2000,11 +2386,11 @@ msgstr ""
 "\n"
 "如果您不知道应该选什么答案的话，就选“0”。"
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "如果您想要为所有用户标识签名的话就选“yes”"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2012,11 +2398,11 @@ msgstr ""
 "如果您真的想要删除这个用户标识的话就回答“yes”。\n"
 "所有相关认证在此之后也会丢失！"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "如果可以删除这把子钥，请回答“yes”"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2026,7 +2412,7 @@ msgstr ""
 "因为要与这把密钥或拥有这把密钥的签名的密钥建立认证关系可能\n"
 "相当重要。"
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2037,13 +2423,13 @@ msgstr ""
 "直到您知道此签名使用了哪一把密钥；因为用来签名的密钥可能与\n"
 "其他已经验证的密钥存在信任关系。"
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "这份签名无效。应当把它从您的钥匙环里删除。"
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2056,7 +2442,7 @@ msgstr ""
 "只有在这把密钥的第一个自身签名因某些原因失效，而有第二个自身签\n"
 "字可用的情况下才这么做。"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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"
@@ -2065,23 +2451,23 @@ msgstr ""
 "用现有的首选项更新所有(或选定的)用户标识的首选项。所有受影响的自身签\n"
 "字的时间戳都会增加一秒钟。\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "请再次输入上次的密码，以确定您到底键入了些什么。"
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "请给定要添加签名的文件名"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "如果可以覆盖这个文件，请回答“yes”"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2089,7 +2475,7 @@ msgstr ""
 "请输入一个新的文件名。如果您直接按下了回车，那么就会使用显示在括\n"
 "号中的默认的文件名。"
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2116,7 +2502,7 @@ msgstr ""
 "      如果这个用户标识不再被使用了，请选此项；这通常用表明某个电子邮\n"
 "      件地址已不再有效。\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2126,11 +2512,11 @@ msgstr ""
 "字简明扼要。\n"
 "键入一空行以结束输入。\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "没有可用的帮助"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "‘%s’没有可用的帮助"
@@ -2163,356 +2549,351 @@ msgstr "导入后清除密钥中无用的部分"
 msgid "remove as much as possible from key after import"
 msgstr "导入后尽可能清除密钥中的可选部分"
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "跳过 %d 样式的区块\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目前已处理 %lu 把密钥\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "合计被处理的数量：%lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  已跳过的新密钥：%lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    遗失用户标识：%lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "          已导入：%lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          未改变：%lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      新用户标识：%lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "        新的子钥：%lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        新的签名：%lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    新的密钥吊销：%lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      读取的私钥：%lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "      导入的私钥：%lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    未改变的私钥：%lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        未被导入：%lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "      清除的签名：%lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  清除的用户标识：%lu\n"
 
-#: g10/import.c:566
+#: g10/import.c:568
 #, fuzzy, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n"
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "      新用户标识：%lu\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”：对称加密算法 %s 对应首选项\n"
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥 %s：PKS 子钥破损已修复\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自身签名所致\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥――已跳过\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥“%s”已导入\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s”一个新的用户标识\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s”1 个新的签名\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s”%d 个新的签名\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s”1 个新的子钥\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s”未改变\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "密钥 %s：已在私钥钥匙环中\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "密钥 %s：找不到私钥：%s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签名没有用户标识\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子钥\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子钥绑定\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子钥绑定\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子钥吊销\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子钥吊销\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识“%s”\n"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子钥\n"
@@ -2521,133 +2902,133 @@ msgstr "密钥 %s：已跳过子钥\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已新增直接密钥签名\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "注意：密钥的序列号与卡的不符\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "注意：主钥在线，存储在卡上\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "注意：子钥在线，存储在卡上\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "钥匙环‘%s’已建立\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "密钥块资源‘%s’：%s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[吊销]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[自身签名]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 个损坏的签名\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 个损坏的签名\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份签名因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份签名因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份签名因为某个错误而未被检查\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份签名因为某些错误而未被检查\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "检测到 1 个没有有效自身签名的用户标识\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "检测到 %d 个没有有效自身签名的用户标识\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2658,17 +3039,17 @@ msgstr ""
 "查\n"
 "指纹等)？\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉强相信\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全相信\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2677,45 +3058,45 @@ msgstr ""
 "请输入这份信任签名的深度。\n"
 "深度若大于 1 则您将签名的这把密钥将可以以您的名义做出信任签名。\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入这份签名的限制域，如果没有请按回车。\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签名吗？(y/N)"
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签名。\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "用户标识“%s”已过期。"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "警告：用户标识“%s”不含自身签名。"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "可以为用户标识“%s”添加签名。"
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "为其添加签名吗？(y/N)"
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2724,75 +3105,75 @@ msgstr ""
 "“%s”的自身签名是 PGP 2.x 样\n"
 "式的签名。\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "您是否想要将它升级成 OpenPGP 的自身签名？(y/N)"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr "您目前为“%s”的签名已经过期了。\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "您想要发布一份新的签名来取代已过期的那一个吗？(y/N)"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr "您目前为“%s”的签名是一份本地签名。\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "您是否想要把它升级成可以完全导出的签名？(y/N)"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s”已由密钥 %s 在本地签名\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s”已由密钥 %s 签名\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "您仍然想要为它再次签名吗？(y/N)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "没有东西可以让密钥 %s 签名\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "这把密钥已经过期！"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "这把密钥将在 %s 过期。\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想要让您的签名也同时过期吗？ (Y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:890
 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:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2801,31 +3182,31 @@ msgstr ""
 "您是否谨慎地检查过，确认正要签名的密钥的确属于以上它所声称的所有者呢？\n"
 "如果您不知道这个问题的答案，请输入“0”。\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答。 %s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本没有检查过。 %s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我随意检查过。 %s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地检查过。 %s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr "您的选择？(输入‘?’以获得更多的信息)："
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2834,74 +3215,74 @@ msgstr ""
 "您真的确定要签名这把密钥，使用您的密钥\n"
 "“%s”(%s)\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr "这将是一个自身签名。\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告：这份签名不会被标记为不可导出。\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告：这份签名不会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "这份签名会被标记成不可导出。\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "这份签名会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr "我根本没有检查过这把密钥。\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr "我随意检查过这把密钥。\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地检查过这把密钥。\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "无法编辑这把密钥： %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2909,11 +3290,11 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2921,184 +3302,184 @@ msgstr ""
 "您不想要用密码――这大概是个坏主意！\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 msgid "Do you really want to do this? (y/N) "
 msgstr "您真的想要这么做吗？(y/N)"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把密钥的签名移动到正确的位置去\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "保存并离开"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 msgid "show key fingerprint"
 msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "select subkey N"
 msgstr "选择子钥 N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 msgid "check signatures"
 msgstr "检查签名"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 msgid "sign selected user IDs locally"
 msgstr "为所选用户标识添加本地签名"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "sign selected user IDs with a trust signature"
 msgstr "为所选用户标识添加信任签名"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "为所选用户标识添加不可吊销签名"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 msgid "delete selected user IDs"
 msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 msgid "add a subkey"
 msgstr "添加一个子钥"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr "将备份密钥转移到卡上"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 msgid "delete selected subkeys"
 msgstr "删除选定的子钥"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 msgid "delete signatures from the selected user IDs"
 msgstr "删除所选用户标识上的签名"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "变更密钥或所选子钥的使用期限"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr "将所选的用户标识设为首选用户标识"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 msgid "toggle between the secret and public key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 msgid "set preference list for the selected user IDs"
 msgstr "设定所选用户标识的首选项"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "设定所选用户标识的首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 msgid "set a notation for the selected user IDs"
 msgstr "为所选用户标识的设定注记"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 msgid "revoke signatures on the selected user IDs"
 msgstr "吊销所选用户标识上的签名"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 msgid "revoke selected user IDs"
 msgstr "吊销选定的用户标识"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 msgid "revoke key or selected subkeys"
 msgstr "吊销密钥或选定的子钥"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 msgid "enable key"
 msgstr "启用密钥"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 msgid "disable key"
 msgstr "禁用密钥"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr "显示选定的照片标识"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "压缩不可用的用户标识并删除不可用的签名"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "压缩不可用的用户标识并删除所有签名"
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "读取私钥区块“%s”时出错：%s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "请先使用“toggle”指令。\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3109,245 +3490,245 @@ msgstr ""
 "  信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n"
 "  合(ltsign、tnrsign 等)。\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签名吗？(y/N)"
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示：选择要添加签名的用户标识\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的签名类型‘%s’\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识！\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要删除所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要删除这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要删除主钥吗？(y/N)"
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 msgid "You must select exactly one key.\n"
 msgstr "您必须指定一把密钥。\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr "命令需要一个文件名作为参数\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "从‘%s’读取备份密钥时出错：%s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一把密钥。\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想要删除选定的密钥吗？(y/N)"
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除这把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "您真的要吊销整把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "您真的要吊销选定的子钥吗？(y/N)"
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这把子钥吗？(y/N)"
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 msgid "Set preference list to:\n"
 msgstr "设为首选项列表为：\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 msgid "Notations: "
 msgstr "注记："
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3356,54 +3737,54 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签名吗？(y/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3412,361 +3793,366 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 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:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\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:3434
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签名\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 msgid "Enter the notation: "
 msgstr "输入注记："
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N)"
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "首选项‘%s’重复\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "太多对称加密算法首选项\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "太多散列算法首选项\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "太多首选压缩算法\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "正在写入直接签名\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "正在写入自身签名\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr "签名"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr "验证"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr "认证"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥可能的操作："
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr "目前允许的操作："
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 选择是否用于签名\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 选择是否用于加密\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 选择是否用于认证\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (仅用于签名)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (自定义用途)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (仅用于加密)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (仅用于签名)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 密钥对会有 %u 位。\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要用多大的密钥尺寸？(%u)"
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3782,7 +4168,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3798,38 +4184,38 @@ msgstr ""
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是多久？(%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3837,11 +4223,11 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3857,44 +4243,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3905,7 +4291,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -3920,23 +4306,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1997
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3944,12 +4330,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -3961,7 +4347,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -3971,50 +4357,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签名。\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4022,47 +4408,47 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "永不过期"
 
@@ -4090,613 +4476,586 @@ msgstr "签名注记："
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "主钥指纹："
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "子钥指纹："
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr " 主钥指纹："
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 msgid "      Key fingerprint ="
 msgstr "密钥指纹 ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr "卡序列号 ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告：两个文件存在有互相矛盾的信息。\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是没有改变的那一个\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一个\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "请修补这个可能的安全性漏洞\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "缓存钥匙环‘%s’\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前已缓存 %lu 把密钥(%lu 份签名)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "缓存了 %lu 把密钥(%lu 份签名)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s：钥匙环已建立\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr "在搜索结果中包含已吊销的密钥"
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr "按钥匙号搜索时包含子钥"
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr "向公钥服务器辅助程序传递数据时使用临时文件"
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr "不删除使用过的临时文件"
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "验证签名时自动下载密钥"
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "使用密钥中指定的首选公钥服务器 URL"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "获取密钥时使用密钥上的 PKA 记录"
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥“%s”\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s，从 %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "在 %s 服务器 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "在 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获取 URI %s：%s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "不能解析 URI %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密过的会话密钥尺寸(%d)诡异\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会话密钥\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：报文未受到完整的保护\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发件者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 msgid "no signature found\n"
 msgstr "未找到签名\n"
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "签名验证已被抑制\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理这些有歧义的签名\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签名建立于 %s\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于“%s”"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于“%s”"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于“%s”"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签名\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "无法禁用核心内存转储：%s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 使用试验性质的公钥算法 %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告：使用试验性质的对称加密算法 %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告：使用试验性质的散列算法 %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告：不建议使用散列算法 %s\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：不建议使用该选项“%s”\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "不压缩"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1106
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "文件‘%s’已存在。 "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 msgid "Overwrite? (y/N) "
 msgstr "是否覆盖？(y/N)"
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s：未知的后缀名\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "请输入新的文件名"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "正在写入到标准输出\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "假定被签名的数据是‘%s’\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "新的配置文件‘%s’已建立\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
 
-#: g10/openfile.c:424
-#, c-format
-msgid "directory `%s' created\n"
-msgstr "已创建目录‘%s’\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent 在此次舍话中无法使用\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "不支持 gpg-agent 协议版本 %d\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "无法连接至‘%s’：%s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
@@ -4758,7 +5117,7 @@ msgstr "         (主钥 %s 的子钥)"
 msgid "Repeat passphrase: "
 msgstr "请再输入一次密码："
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4771,38 +5130,34 @@ msgstr ""
 "片会被存放在您的公钥里。如果您挑了非常大的图片的话，您的密钥也会变得非\n"
 "常大！请尽量把图片尺寸控制在240x288左右，这是个理想的尺寸。\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "输入要当作相片标识的JPEG文件名： "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "无法打开 JPEG 文件‘%s’：%s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "这个 JPEG 文件太大了(%d 字节)！\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "您确定要用它吗？(y/N)"
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "“%s”不是一个 JPEG 文件\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "这张照片正确吗？(y/N/q)"
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr "没有设置照片查看程序\n"
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
 
@@ -5068,61 +5423,56 @@ msgstr "没有有效的地址\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "数据未被保存；请用“--output”选项来保存它们\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "建立‘%s’时发生错误：%s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "分离的签名。\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "请输入数据文件的名称： "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "正在从标准输入读取 ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "不含签名的数据\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "匿名收件者；正在尝试使用私钥 %s ……\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好，我们就是匿名收件者。\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支持旧式的 DEK 编码\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "对称加密算法 %d%s 未知或已停用\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "注意：收件人的首选项中找不到加密算法 %s\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "注意：私钥 %s 已于 %s 过期\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "注意：密钥已被吊销"
 
@@ -5241,144 +5591,144 @@ msgstr "(不给定描述)\n"
 msgid "Is this okay? (y/N) "
 msgstr "这样可以吗？ (y/N)"
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "保护算法 %d%s 未被支持\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "无效的密码；请再试一次"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s……\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "警告：检测到弱密钥――请更换密码。\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "正在产生私钥保护使用的旧式 16 位校验和\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "建立了弱密钥――正在重试\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "对称加密无法避免生成弱密钥；已经尝试 %d 次！\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA 需要散列值长度为 8 位的倍数\n"
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "DSA 密钥 %s 需要 %u 位或更长的散列\n"
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告：签名散列值与报文不一致\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "警告：签名的子钥 %s 未经交叉验证\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告：签名的子钥 %s 交叉验证无效\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "注意：签名密钥 %s 已于 %s 过期\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n"
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入注记数据\n"
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告：注记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5395,48 +5745,48 @@ msgstr "检查已建立的签名时发生错误： %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "“%s”已跳过：重复\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "“%s”已跳过：%s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "已跳过：私钥已存在\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
 
@@ -5490,51 +5840,51 @@ msgstr "读取‘%s’错误：%s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：同步失败：%s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "信任度数据库处理量过大\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s：目录不存在！\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "不能为‘%s’创建锁定\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "无法锁定‘%s’\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s：建立版本记录失败：%s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s：建立了无效的信任度数据库\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s：建立了信任度数据库\n"
@@ -5543,78 +5893,78 @@ msgstr "%s：建立了信任度数据库\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "注意：信任度数据库不可写入\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s：无效的信任度数据库\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s：更新版本记录时出错： %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s：读取版本记录时出错： %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s：写入版本记录时出错：%s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任度数据库：lseek 失败：%s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任度数据库：read 失败(n=%d)：%s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s：不是一个信任度数据库文件\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s：记录编号为%lu的版本记录\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s：无效的文件版本%d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s：读取自由记录时出错：%s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s：写入目录记录时出错：%s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s：记录归零时失败：%s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s：附加记录时失败：%s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n"
 
@@ -5623,7 +5973,7 @@ msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n"
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "无法处理长于 %d 字符的文本行\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "输入行长度超过 %d 字符\n"
@@ -5788,7 +6138,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5798,309 +6148,1616 @@ msgstr ""
 "请记住签名文件(.sig或.asc)\n"
 "应该是在命令行中给定的第一个文件。\n"
 
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "常规错误"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "您找到一个程序缺陷了……(%s:%d)\n"
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "未知的包类型"
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "未知的版本"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "签名时失败： %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "未知的公钥算法"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "未知的散列算法"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "公钥已经损坏"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "私钥已经损坏"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr ""
+"请向 <[email protected]> 报告程序缺陷。\n"
+"请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "签名已经损坏"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "校验和错误"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "错误的密码"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "找不到公钥"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "未知的对称加密算法"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "无法存储指纹：%s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "无法打开钥匙环"
+#: scd/app-openpgp.c:609
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "无法存储创建日期：%s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "无效包"
+#: scd/app-openpgp.c:1004
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "无法读出公钥：%s\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "无效的 ASCII 封装格式"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr "响应未包含公钥数据\n"
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "没有这个用户标识"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr "响应未包含 RSA 余数\n"
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "私钥不可用"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr "响应未包含 RSA 公钥指数\n"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "使用了错误的私钥"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN 回调返回错误：%s\n"
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "未被支持"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "密钥已损坏"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "验证 CHV%d 失败：%s\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "文件读取错误"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr "尚未配置管理员命令的权限\n"
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "文件写入错误"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "未知的压缩算法"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr "卡被永久锁定！\n"
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "文件打开错误"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "文件建立错误"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr "|A|管理员 PIN"
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "无效的密码"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr "|AN|新的管理员 PIN"
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "未实现的公钥算法"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr "新的 PIN"
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "未实现的对称加密算法"
+#: scd/app-openpgp.c:1535
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "获取新 PIN 时出错：%s\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "未知的签名等级"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+msgid "error reading application data\n"
+msgstr "读取应用程序数据时出错\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "信任度数据库错误"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+msgid "error reading fingerprint DO\n"
+msgstr "读取指纹 D0 出错\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "损坏的多精度整数(MPI)"
+#: scd/app-openpgp.c:1601
+msgid "key already exists\n"
+msgstr "密钥已存在\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "资源限制"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr "现有的密钥将被替换\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "无效的钥匙环"
+#: scd/app-openpgp.c:1607
+msgid "generating new key\n"
+msgstr "生成新密钥\n"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "证书已损坏"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr "缺少创建时间戳\n"
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "被变造过的用户标识"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "文件关闭错误"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "文件重命名错误"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "文件删除错误"
+#: scd/app-openpgp.c:1866
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "无法存储密钥：%s\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "非预期的数据"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr "请稍候，正在生成密钥……\n"
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "时间戳冲突"
+#: scd/app-openpgp.c:1939
+msgid "generating key failed\n"
+msgstr "生成密钥失败\n"
+
+#: scd/app-openpgp.c:1942
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "无法使用的公钥算法"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "文件已存在"
+#: scd/app-openpgp.c:2125
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "卡不支持散列算法 %s\n"
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "弱密钥"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "目前已创建的签名：%lu\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "无效的参数"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "URI 已损坏"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "未被支持的 URI"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "网络错误"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "未被加密"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "从‘%s’读取选项\n"
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "未被处理"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "不可用的公钥"
+#: scd/scdaemon.c:122
+msgid "|NAME|use NAME as ct-API driver"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "不可用的私钥"
+#: scd/scdaemon.c:123
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr ""
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "公钥服务器错误"
+#: scd/scdaemon.c:126
+msgid "do not use the internal CCID driver"
+msgstr ""
 
-#: util/errors.c:109
-msgid "canceled"
-msgstr "已取消"
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
-msgid "no card"
-msgstr "没有卡"
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "显示管理员命令"
 
-#: util/errors.c:111
-msgid "no data"
-msgstr "无数据"
+#: scd/scdaemon.c:191
+#, fuzzy
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: util/logger.c:158
-msgid "ERROR: "
-msgstr "错误："
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
-msgstr "警告："
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "……这是个程序缺陷(%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "您找到一个程序缺陷了……(%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "yes"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "跳过无效的 64 进制字符 %02x\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "yY"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "不支持 gpg-agent 协议版本 %d\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "不支持 gpg-agent 协议版本 %d\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "无法打开‘%s’：%s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "不允许导出私钥\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "无法存储密钥：%s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "注意：密钥已被吊销"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "证书已损坏"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "可用的密钥在："
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "检查已建立的签名时发生错误： %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "生成一份吊销证书"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "这把密钥已经过期！"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "CA 指纹："
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "检查已建立的签名时发生错误： %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "验证签名"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA 要求使用 160 位的散列算法\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "[未设定]"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "错误：无效的响应。\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "错误：无效的响应。\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"您需要这个用户的密码来解开私钥：\n"
+"“%.*s”\n"
+"%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "取得当前密钥信息时出错：%s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "无效的‘%s’散列算法\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "电子邮件地址无效\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "建立钥匙环‘%s’时发生错误：%s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "生成密钥失败：%s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "找不到私钥“%s”：%s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "读取密钥区块时发生错误：%s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "已建立吊销证书。\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "首选项‘%s’重复\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "删除密钥区块时失败：%s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(不给定描述)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "生成密码的时候发生错误：%s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s：写入目录记录时出错：%s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[文件名]|生成一份签名"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[文件名]|生成一份明文签名"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "列出私钥"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "证书已损坏"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "从公钥钥匙环里删除密钥"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "证书已损坏"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "证书已损坏"
+
+#: sm/gpgsm.c:263
+#, fuzzy
+msgid "register a smartcard"
+msgstr "在智能卡上添加一把密钥"
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "更改密码"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "输出经 ASCII 封装"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr ""
+
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "use the default key as default recipient"
+msgstr "已跳过：公钥已被设为默认收件者\n"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "force v3 signatures"
+msgstr "检查签名"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr ""
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr ""
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:351
+#, fuzzy
+msgid "add this keyring to the list of keyrings"
+msgstr "从这个钥匙环里取用密钥"
+
+#: sm/gpgsm.c:352
+#, fuzzy
+msgid "add this secret keyring to the list"
+msgstr "要有私钥才能这么做。\n"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr ""
+
+#: sm/gpgsm.c:355
+#, fuzzy
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|某甲|为收件者“某甲”加密"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr ""
+
+#: sm/gpgsm.c:380
+#, fuzzy
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "未知的对称加密算法"
+
+#: sm/gpgsm.c:382
+#, fuzzy
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "%s 签名，散列算法 %s\n"
+
+#: sm/gpgsm.c:384
+#, fuzzy
+msgid "|N|use compress algorithm N"
+msgstr "未知的压缩算法"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"语法：gpg [选项] [文件名]\n"
+"签名、检查、加密或解密\n"
+"默认的操作依输入数据而定\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "用法：gpg [选项] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "无法连接至‘%s’：%s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "无法存取‘%s’：%s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "合计被处理的数量：%lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "生成一份吊销证书"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "生成密码的时候发生错误：%s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "读取‘%s’时出错：%s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "建立钥匙环‘%s’时发生错误：%s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "钥匙环‘%s’已建立\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "无法存储指纹：%s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "无法存储密钥：%s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "取得当前密钥信息时出错：%s\n"
+
+#: sm/keydb.c:1392
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "获取新 PIN 时出错：%s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "读取‘%s’时出错：%s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "错误：指纹格式无效。\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "检查已建立的签名时发生错误： %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "签名建立于 %s\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "完好的签名，来自于“%s”"
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "              亦即“%s”"
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "quit"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "qQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
-msgstr "okay|ok"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
-msgstr "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
+msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
-msgstr "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
+msgstr ""
 
-#: util/miscutil.c:411
-msgid "cC"
-msgstr "cC"
+#: tools/gpg-connect-agent.c:126
+#, fuzzy
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
+
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "列太长"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "未知的选项 '%s'\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "签名时失败： %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "无法读出公钥：%s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "读取‘%s’时出错：%s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
+
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
+
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "用法：gpg [选项] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "找不到公钥"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "建立钥匙环‘%s’时发生错误：%s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@指令：\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "解密成功\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "解密成功\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [文件名]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s 不可与 %s 并用\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "无法建立目录‘%s’：%s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "写入钥匙环‘%s’时出错： %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "读取‘%s’时出错：%s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "‘%s’中出错：%s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "不支持远程调用\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "无法建立‘%s’：%s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "无法建立‘%s’：%s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "更新失败：%s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "删除密钥区块时失败：%s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "更新失败：%s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "更新失败：%s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "更新失败：%s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "不能创建备份文件‘%s’：%s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "不能创建备份文件‘%s’：%s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "不支持保护散列 %d\n"
+
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "当 pbits=%u 而 qbits=%u 时不能生成质数\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "少于 %d 位时不能生成质数\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "检测不到熵搜集模块\n"
+
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "无法锁定‘%s’：%s\n"
+
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "等待‘%s’上的锁\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "无法获得文件‘%s’的信息： %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "‘%s’不是一个普通文件――已忽略\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "注意：随机数种子文件为空\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "警告：随机数种子文件大小无效――未使用\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "无法读取‘%s’：%s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "注意：随机数种子文件未被更新\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "无法写入‘%s’：%s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "无法关闭‘%s’：%s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "警告：正在使用不安全的随机数发生器！！\n"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "私钥不可用"
+
+#~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
+#~ msgstr "请插入卡并回车，或输入‘c’来取消："
+
+#~ msgid ""
+#~ "Please remove the current card and insert the one with serial number:\n"
+#~ "   %.*s\n"
+#~ msgstr ""
+#~ "请取出当前的卡，并插入有下列序列号的卡：\n"
+#~ "  %.*s\n"
+
+#~ msgid "Hit return when ready or enter 'c' to cancel: "
+#~ msgstr "就绪后请回车，或输入‘c’取消"
+
+#~ msgid "Enter New Admin PIN: "
+#~ msgstr "输入新的管理员 PIN："
+
+#~ msgid "Enter New PIN: "
+#~ msgstr "输入新的 PIN："
+
+#~ msgid "Enter Admin PIN: "
+#~ msgstr "输入管理员 PIN："
+
+#~ msgid "Enter PIN: "
+#~ msgstr "输入 PIN："
+
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "注意：%s 本版本中不可用\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "      新用户标识：%lu\n"
+
+#~ msgid "no photo viewer set\n"
+#~ msgstr "没有设置照片查看程序\n"
+
+#~ msgid "general error"
+#~ msgstr "常规错误"
+
+#~ msgid "unknown packet type"
+#~ msgstr "未知的包类型"
+
+#~ msgid "unknown version"
+#~ msgstr "未知的版本"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "未知的公钥算法"
+
+#~ msgid "unknown digest algorithm"
+#~ msgstr "未知的散列算法"
+
+#~ msgid "bad public key"
+#~ msgstr "公钥已经损坏"
+
+#~ msgid "bad secret key"
+#~ msgstr "私钥已经损坏"
+
+#~ msgid "bad signature"
+#~ msgstr "签名已经损坏"
+
+#~ msgid "checksum error"
+#~ msgstr "校验和错误"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "无法打开钥匙环"
+
+#~ msgid "invalid packet"
+#~ msgstr "无效包"
+
+#~ msgid "invalid armor"
+#~ msgstr "无效的 ASCII 封装格式"
+
+#~ msgid "no such user id"
+#~ msgstr "没有这个用户标识"
+
+#~ msgid "secret key not available"
+#~ msgstr "私钥不可用"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "使用了错误的私钥"
+
+#~ msgid "not supported"
+#~ msgstr "未被支持"
+
+#~ msgid "bad key"
+#~ msgstr "密钥已损坏"
+
+#~ msgid "file read error"
+#~ msgstr "文件读取错误"
+
+#~ msgid "file write error"
+#~ msgstr "文件写入错误"
+
+#~ msgid "file open error"
+#~ msgstr "文件打开错误"
+
+#~ msgid "file create error"
+#~ msgstr "文件建立错误"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "无效的密码"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "未实现的公钥算法"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "未实现的对称加密算法"
+
+#~ msgid "unknown signature class"
+#~ msgstr "未知的签名等级"
+
+#~ msgid "trust database error"
+#~ msgstr "信任度数据库错误"
+
+#~ msgid "resource limit"
+#~ msgstr "资源限制"
+
+#~ msgid "invalid keyring"
+#~ msgstr "无效的钥匙环"
+
+#~ msgid "malformed user id"
+#~ msgstr "被变造过的用户标识"
+
+#~ msgid "file close error"
+#~ msgstr "文件关闭错误"
+
+#~ msgid "file rename error"
+#~ msgstr "文件重命名错误"
+
+#~ msgid "file delete error"
+#~ msgstr "文件删除错误"
+
+#~ msgid "unexpected data"
+#~ msgstr "非预期的数据"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "时间戳冲突"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "无法使用的公钥算法"
+
+#~ msgid "file exists"
+#~ msgstr "文件已存在"
+
+#~ msgid "weak key"
+#~ msgstr "弱密钥"
+
+#~ msgid "invalid argument"
+#~ msgstr "无效的参数"
+
+#~ msgid "bad URI"
+#~ msgstr "URI 已损坏"
+
+#~ msgid "unsupported URI"
+#~ msgstr "未被支持的 URI"
+
+#~ msgid "network error"
+#~ msgstr "网络错误"
+
+#~ msgid "not encrypted"
+#~ msgstr "未被加密"
+
+#~ msgid "not processed"
+#~ msgstr "未被处理"
+
+#~ msgid "unusable public key"
+#~ msgstr "不可用的公钥"
+
+#~ msgid "unusable secret key"
+#~ msgstr "不可用的私钥"
+
+#~ msgid "keyserver error"
+#~ msgstr "公钥服务器错误"
+
+#~ msgid "no card"
+#~ msgstr "没有卡"
+
+#~ msgid "no data"
+#~ msgstr "无数据"
+
+#~ msgid "ERROR: "
+#~ msgstr "错误："
+
+#~ msgid "WARNING: "
+#~ msgstr "警告："
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "警告：正在使用不安全的内存！\n"
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "……这是个程序缺陷(%s:%d:%s)\n"
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n"
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "警告：正在使用不安全的内存！\n"
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "安全内存未初始化，不能进行操作\n"
+#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#~ msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(您可能使用了错误的程序来完成此项任务)\n"
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "安全内存未初始化，不能进行操作\n"
 
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA 要求使用 160 位的散列算法\n"
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(您可能使用了错误的程序来完成此项任务)\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ce0bd30ae..651db3d72 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-08-01 13:07+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2006-09-25 09:00+0200\n"
 "PO-Revision-Date: 2005-07-29 09:49+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -17,291 +17,720 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
-#, c-format
-msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "無法以 %u 位元長的 p 以及 %u 位元長的 q 產生質數\n"
+#: agent/call-pinentry.c:193
+#, fuzzy, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "存放指紋失敗: %s\n"
 
-#: cipher/primegen.c:312
-#, c-format
-msgid "can't generate a prime with less than %d bits\n"
-msgstr "無法產生少於 %d 位元的質數\n"
+#: agent/call-pinentry.c:356
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
 
-#: cipher/random.c:173
-msgid "no entropy gathering module detected\n"
-msgstr "偵測不到亂數蒐集模組\n"
+#: agent/call-pinentry.c:359
+#, fuzzy
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: cipher/random.c:403
-#, fuzzy, c-format
-msgid "can't lock `%s': %s\n"
-msgstr "無法鎖定 `%s'\n"
+#: agent/call-pinentry.c:417 agent/call-pinentry.c:429
+#, fuzzy
+msgid "PIN too long"
+msgstr "列太長"
 
-#: cipher/random.c:408
+#: agent/call-pinentry.c:418
+#, fuzzy
+msgid "Passphrase too long"
+msgstr "列太長"
+
+#: agent/call-pinentry.c:426
+#, fuzzy
+msgid "Invalid characters in PIN"
+msgstr "姓名含有無效的字符\n"
+
+#: agent/call-pinentry.c:431
+msgid "PIN too short"
+msgstr ""
+
+#: agent/call-pinentry.c:443
+#, fuzzy
+msgid "Bad PIN"
+msgstr "損壞的 MPI"
+
+#: agent/call-pinentry.c:444
+#, fuzzy
+msgid "Bad Passphrase"
+msgstr "錯誤的密語"
+
+#: agent/call-pinentry.c:484
+#, fuzzy
+msgid "Passphrase"
+msgstr "錯誤的密語"
+
+#: agent/command-ssh.c:533
 #, fuzzy, c-format
-msgid "waiting for lock on `%s'...\n"
-msgstr "正在將私鑰寫至 `%s'\n"
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "保護摘要 %d 未被支援\n"
+
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
+#: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "無法建立 `%s': %s\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
-#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
+#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
+#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
+#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
+#: sm/gpgsm.c:1792 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: cipher/random.c:458
-#, c-format
-msgid "can't stat `%s': %s\n"
-msgstr "無法取得檔案 `%s' 的資訊: %s\n"
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: cipher/random.c:463
+#: agent/command-ssh.c:1623
 #, c-format
-msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' 不是一個標準的檔案 - 已略過\n"
+msgid "detected card with S/N: %s\n"
+msgstr ""
 
-#: cipher/random.c:468
-msgid "note: random_seed file is empty\n"
-msgstr "請注意: random_seed 檔案是空的\n"
+#: agent/command-ssh.c:1628
+#, fuzzy, c-format
+msgid "error getting default authentication keyID of card: %s\n"
+msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: cipher/random.c:474
-msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "警告: random_seed 檔案大小無效 - 不予採用\n"
+#: agent/command-ssh.c:1648
+#, fuzzy, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
 
-#: cipher/random.c:482
-#, c-format
-msgid "can't read `%s': %s\n"
-msgstr "無法讀取 `%s': %s\n"
+#: agent/command-ssh.c:1698
+#, fuzzy, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "讀取公鑰時失敗: %s\n"
 
-#: cipher/random.c:520
-msgid "note: random_seed file not updated\n"
-msgstr "請注意: random_seed 檔案未被更新\n"
+#: agent/command-ssh.c:1713
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
-#, c-format
-msgid "can't create `%s': %s\n"
-msgstr "無法建立 `%s': %s\n"
+#: agent/command-ssh.c:2018
+#, fuzzy, c-format
+msgid "Please enter the passphrase for the ssh key%0A  %c"
+msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "can't write `%s': %s\n"
-msgstr "無法寫入 `%s': %s\n"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
 
-#: cipher/random.c:569
-#, c-format
-msgid "can't close `%s': %s\n"
-msgstr "無法關閉 `%s': %s\n"
+#: agent/command-ssh.c:2857
+#, fuzzy, c-format
+msgid "failed to create stream from socket: %s\n"
+msgstr "%s: 建立雜湊表失敗: %s\n"
+
+#: agent/divert-scd.c:217
+#, fuzzy
+msgid "Admin PIN"
+msgstr "|A|Admin PIN"
 
-#: cipher/random.c:814
-msgid "WARNING: using insecure random number generator!!\n"
-msgstr "警告: 正在使用不安全的隨機數字產生器!!\n"
+#: agent/divert-scd.c:275
+#, fuzzy
+msgid "Repeat this PIN"
+msgstr "請再次輸入個人識別碼 (PIN): "
 
-#: cipher/random.c:815
-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"
+#: agent/divert-scd.c:278
+msgid "PIN not correctly repeated; try again"
+msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
+
+#: agent/divert-scd.c:290
+#, fuzzy, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
+
+#: agent/genkey.c:109
+#, fuzzy, c-format
+msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
-"這個隨機數字產生器根本就是七拼八湊出來的鳥東西 -\n"
-"它根本就不是強而有力的亂數產生器!\n"
-"\n"
-"*** 絕對不要把這個程式產生的任何資料拿來用!! ***\n"
+"妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "更改密語"
+
+#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: tools/symcryptrun.c:484
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/genkey.c:218
+#, fuzzy
+msgid "Please enter the new passphrase"
+msgstr "更改密語"
+
+#: agent/gpg-agent.c:109 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
+#, fuzzy
 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"
+"@Options:\n"
+" "
 msgstr ""
-"請稍待片刻, 系統此時正在蒐集亂數. 如果妳會覺得無聊的話,\n"
-"不妨做些別的事, 這樣子甚至能夠讓亂數的品質更好.\n"
+"@\n"
+"選項:\n"
+" "
 
-#: cipher/rndlinux.c:132
-#, c-format
+#: agent/gpg-agent.c:111 scd/scdaemon.c:103
+msgid "run in server mode (foreground)"
+msgstr ""
+
+#: agent/gpg-agent.c:112 scd/scdaemon.c:106
+msgid "run in daemon mode (background)"
+msgstr ""
+
+#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:182
+msgid "verbose"
+msgstr "囉唆模式"
+
+#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
+#: sm/gpgsm.c:336
+msgid "be somewhat more quiet"
+msgstr "盡量安靜些"
+
+#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+msgid "sh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:116 scd/scdaemon.c:110
+msgid "csh-style command output"
+msgstr ""
+
+#: agent/gpg-agent.c:117 tools/symcryptrun.c:185
+#, fuzzy
+msgid "|FILE|read options from FILE"
+msgstr "從 `%s' 讀取選項\n"
+
+#: agent/gpg-agent.c:122 scd/scdaemon.c:119
+msgid "do not detach from the console"
+msgstr ""
+
+#: agent/gpg-agent.c:123
+msgid "do not grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: tools/symcryptrun.c:184
+#, fuzzy
+msgid "use a log file for the server"
+msgstr "在某個金鑰伺服器上搜尋金鑰"
+
+#: agent/gpg-agent.c:126
+#, fuzzy
+msgid "use a standard location for the socket"
+msgstr "設定所選使用者 ID 的偏好清單"
+
+#: agent/gpg-agent.c:130
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:132
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:133
+#, fuzzy
+msgid "do not use the SCdaemon"
+msgstr "更新信任資料庫"
+
+#: agent/gpg-agent.c:140
+msgid "ignore requests to change the TTY"
+msgstr ""
+
+#: agent/gpg-agent.c:142
+msgid "ignore requests to change the X display"
+msgstr ""
+
+#: agent/gpg-agent.c:145
+msgid "|N|expire cached PINs after N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:150
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:152
+msgid "allow clients to mark keys as \"trusted\""
+msgstr ""
+
+#: agent/gpg-agent.c:154
+#, fuzzy
+msgid "allow presetting passphrase"
+msgstr "建立密語的時候發生錯誤: %s\n"
+
+#: agent/gpg-agent.c:155
+msgid "enable ssh-agent emulation"
+msgstr ""
+
+#: agent/gpg-agent.c:157
+msgid "|FILE|write environment settings also to FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+#, fuzzy
+msgid "Please report bugs to <"
+msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
+
+#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:222
+msgid ">.\n"
+msgstr ""
+
+#: agent/gpg-agent.c:239
+#, fuzzy
+msgid "Usage: gpg-agent [options] (-h for help)"
+msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
+
+#: agent/gpg-agent.c:241
 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"
+"Syntax: gpg-agent [options] [command [args]]\n"
+"Secret key management for GnuPG\n"
 msgstr ""
-"\n"
-"隨機位元組不夠多. 請多做一些有的沒的事情, \n"
-"這樣作業系統纔能蒐集到更多的亂數! (還需要 %d 位元組)\n"
 
-#: g10/app-openpgp.c:596
+#: agent/gpg-agent.c:300
 #, c-format
-msgid "failed to store the fingerprint: %s\n"
-msgstr "存放指紋失敗: %s\n"
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:609
+#: agent/gpg-agent.c:303
 #, c-format
-msgid "failed to store the creation date: %s\n"
-msgstr "存放創生資料失敗: %s\n"
+msgid "out of core while allocating %lu bytes"
+msgstr ""
 
-#: g10/app-openpgp.c:977
+#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
 #, c-format
-msgid "reading public key failed: %s\n"
-msgstr "讀取公鑰時失敗: %s\n"
+msgid "invalid debug-level `%s' given\n"
+msgstr ""
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
-msgid "response does not contain the public key data\n"
-msgstr "回應中未包含公鑰資料\n"
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: tools/symcryptrun.c:1053
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
-msgid "response does not contain the RSA modulus\n"
-msgstr "回應中未包含 RSA 系數\n"
+#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
-msgid "response does not contain the RSA public exponent\n"
-msgstr "回應中未包含 RSA 公用指數\n"
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "選項檔 `%s': %s\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
 #, c-format
-msgid "PIN callback returned error: %s\n"
-msgstr "個人識別碼 (PIN) 收回時傳回錯誤: %s\n"
+msgid "reading options from `%s'\n"
+msgstr "從 `%s' 讀取選項\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: agent/gpg-agent.c:909 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, c-format
-msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "用於 CHV %d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
+msgid "error creating `%s': %s\n"
+msgstr "建立 `%s' 時發生錯誤: %s\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: agent/gpg-agent.c:1165 agent/gpg-agent.c:1268 agent/gpg-agent.c:1272
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1312 g10/exec.c:174
+#: g10/openfile.c:416 scd/scdaemon.c:911
 #, c-format
-msgid "verify CHV%d failed: %s\n"
-msgstr "驗證 CHV %d 失敗: %s\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "無法建立目錄 `%s': %s\n"
 
-#: g10/app-openpgp.c:1310
-msgid "access to admin commands is not configured\n"
-msgstr "取用管理者指令尚未被組態過\n"
+#: agent/gpg-agent.c:1179 scd/scdaemon.c:925
+msgid "name of socket too long\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
-msgid "error retrieving CHV status from card\n"
-msgstr "從卡片取回 CHV 狀態時出錯\n"
+#: agent/gpg-agent.c:1205 scd/scdaemon.c:951
+#, fuzzy, c-format
+msgid "can't create socket: %s\n"
+msgstr "無法建立 `%s': %s\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
-msgid "card is permanently locked!\n"
-msgstr "卡片已被永久鎖住了!!\n"
+#: agent/gpg-agent.c:1234 scd/scdaemon.c:980
+#, fuzzy, c-format
+msgid "error binding socket to `%s': %s\n"
+msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
+
+#: agent/gpg-agent.c:1242 scd/scdaemon.c:988
+#, fuzzy, c-format
+msgid "listen() failed: %s\n"
+msgstr "更新失敗: %s\n"
+
+#: agent/gpg-agent.c:1248 scd/scdaemon.c:994
+#, fuzzy, c-format
+msgid "listening on socket `%s'\n"
+msgstr "正在將私鑰寫至 `%s'\n"
 
-#: g10/app-openpgp.c:1336
+#: agent/gpg-agent.c:1276 agent/gpg-agent.c:1318 g10/openfile.c:419
 #, c-format
-msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺留下來\n"
+msgid "directory `%s' created\n"
+msgstr "目錄 `%s' 已建立\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1343
-msgid "|A|Admin PIN"
-msgstr "|A|Admin PIN"
+#: agent/gpg-agent.c:1324
+#, fuzzy, c-format
+msgid "stat() failed for `%s': %s\n"
+msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#. TRANSLATORS: Do not translate the "|*|" prefixes but
-#. keep it at the start of the string.  We need this elsewhere
-#. to get some infos on the string.
-#: g10/app-openpgp.c:1492
-msgid "|AN|New Admin PIN"
-msgstr "|AN|New Admin PIN"
+#: agent/gpg-agent.c:1328
+#, fuzzy, c-format
+msgid "can't use `%s' as home directory\n"
+msgstr "無法建立目錄 `%s': %s\n"
 
-#: g10/app-openpgp.c:1492
-msgid "|N|New PIN"
-msgstr "|N|New PIN"
+#: agent/gpg-agent.c:1427
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: agent/gpg-agent.c:1432
 #, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
-msgid "error reading application data\n"
-msgstr "讀取應用程式資料時出錯\n"
+#: agent/gpg-agent.c:1446
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
-msgid "error reading fingerprint DO\n"
-msgstr "讀取指紋 DO 時出錯\n"
+#: agent/gpg-agent.c:1451
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1562
-msgid "key already exists\n"
-msgstr "金鑰已存在\n"
+#: agent/gpg-agent.c:1545 scd/scdaemon.c:1110
+#, fuzzy, c-format
+msgid "pth_select failed: %s - waiting 1s\n"
+msgstr "更新私鑰失敗: %s\n"
 
-#: g10/app-openpgp.c:1566
-msgid "existing key will be replaced\n"
-msgstr "既有的金鑰將被取代\n"
+#: agent/gpg-agent.c:1629 scd/scdaemon.c:1167
+#, fuzzy, c-format
+msgid "%s %s stopped\n"
+msgstr "%s: 已跳過: %s\n"
 
-#: g10/app-openpgp.c:1568
-msgid "generating new key\n"
-msgstr "正在產生新的金鑰\n"
+#: agent/gpg-agent.c:1650
+#, fuzzy
+msgid "no gpg-agent running in this session\n"
+msgstr "gpg-agent 在此階段無法使用\n"
 
-#: g10/app-openpgp.c:1735
-msgid "creation timestamp missing\n"
-msgstr "建立的時間戳印缺漏\n"
+#: agent/gpg-agent.c:1660 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: g10/passphrase.c:326 sm/call-agent.c:144 tools/gpg-connect-agent.c:713
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: g10/app-openpgp.c:1742
+#: agent/gpg-agent.c:1672 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: g10/passphrase.c:345 sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA 模組缺漏或者尺寸並非 %d 位元\n"
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent 協定版本 %d 未被支援\n"
+
+#: agent/preset-passphrase.c:100
+#, fuzzy
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
+
+#: agent/preset-passphrase.c:103
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+
+#: agent/protect-tool.c:146
+#, fuzzy
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
+
+#: agent/protect-tool.c:148
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]]\n"
+"Secret key maintenance tool\n"
+msgstr ""
+
+#: agent/protect-tool.c:1206
+#, fuzzy
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "請輸入密語; 這是一個秘密的句子 \n"
+
+#: agent/protect-tool.c:1209
+#, fuzzy
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "請輸入密語; 這是一個秘密的句子 \n"
+
+#: agent/protect-tool.c:1212
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+msgstr ""
+
+#: agent/protect-tool.c:1217
+#, fuzzy
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr "請輸入密語; 這是一個秘密的句子 \n"
+
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:485
+#, fuzzy
+msgid "Passphrase:"
+msgstr "錯誤的密語"
+
+#: agent/protect-tool.c:1235 tools/symcryptrun.c:498
+#, fuzzy, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr "建立密語的時候發生錯誤: %s\n"
+
+#: agent/protect-tool.c:1238 tools/symcryptrun.c:502
+#, fuzzy
+msgid "cancelled\n"
+msgstr "已取消"
+
+#: agent/trustlist.c:109 agent/trustlist.c:267
+#, fuzzy, c-format
+msgid "error opening `%s': %s\n"
+msgstr "在 `%s' 中出錯: %s\n"
+
+#: agent/trustlist.c:124
+#, fuzzy, c-format
+msgid "file `%s', line %d: %s\n"
+msgstr "選項檔 `%s': %s\n"
 
-#: g10/app-openpgp.c:1749
+#: agent/trustlist.c:144 agent/trustlist.c:152
 #, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
+msgid "statement \"%s\" ignored in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:158
+#, fuzzy, c-format
+msgid "system trustlist `%s' not available\n"
+msgstr "私鑰部分無法取用\n"
+
+#: agent/trustlist.c:193
+#, fuzzy, c-format
+msgid "bad fingerprint in `%s', line %d\n"
+msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: agent/trustlist.c:211 agent/trustlist.c:218
 #, c-format
-msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr "RSA 質數 %s 缺漏或者尺寸並非 %d 位元\n"
+msgid "invalid keyflag in `%s', line %d\n"
+msgstr ""
+
+#: agent/trustlist.c:228
+#, fuzzy, c-format
+msgid "error reading `%s', line %d: %s\n"
+msgstr "讀取 `%s' 時發生錯誤: %s\n"
+
+#: agent/trustlist.c:320 agent/trustlist.c:349
+msgid "error reading list of trusted root certificates\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1827
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives
+#. the name as store in the certificate.
+#: agent/trustlist.c:424
 #, c-format
-msgid "failed to store the key: %s\n"
-msgstr "存放金鑰失敗: %s\n"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
+msgstr ""
 
-#: g10/app-openpgp.c:1886
-msgid "please wait while key is being generated ...\n"
-msgstr "公鑰正被產生中, 請稍候 ...\n"
+#. TRANSLATORS: "Correct" is the label of a button and intended to
+#. be hit if the fingerprint matches the one of the CA.  The other
+#. button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:433
+msgid "Correct"
+msgstr ""
 
-#: g10/app-openpgp.c:1901
-msgid "generating key failed\n"
-msgstr "產生金鑰時失敗\n"
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break.  The double
+#. percent sign is actually needed because it is also
+#. a printf format string.  If you need to insert a
+#. plain % sign, you need to encode it as "%%25".  The
+#. "%s" gets replaced by the name as store in the
+#. certificate.
+#: agent/trustlist.c:447
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
+
+#: agent/trustlist.c:453
+#, fuzzy
+msgid "Yes"
+msgstr "yes"
+
+#: agent/trustlist.c:453
+msgid "No"
+msgstr ""
+
+#: common/exechelp.c:279 common/exechelp.c:370
+#, fuzzy, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "建立密語的時候發生錯誤: %s\n"
+
+#: common/exechelp.c:346 common/exechelp.c:403
+#, fuzzy, c-format
+msgid "can't fdopen pipe for reading: %s\n"
+msgstr "無法開啟被簽署過的資料 `%s'\n"
+
+#: common/exechelp.c:382 common/exechelp.c:540
+#, fuzzy, c-format
+msgid "error forking process: %s\n"
+msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: common/exechelp.c:438 common/exechelp.c:481
 #, c-format
-msgid "key generation completed (%d seconds)\n"
-msgstr "金鑰產生已完工 (%d 秒)\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1961
-msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "OpenPGP 卡片的格式無效 (DO 0x93)\n"
+#: common/exechelp.c:446
+#, fuzzy, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: g10/app-openpgp.c:2087
+#: common/exechelp.c:452 common/exechelp.c:492
 #, fuzzy, c-format
-msgid "card does not support digest algorithm %s\n"
-msgstr "%s 簽章, 摘要演算法 %s\n"
+msgid "error running `%s': exit status %d\n"
+msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: g10/app-openpgp.c:2134
+#: common/exechelp.c:487
 #, c-format
-msgid "signatures created so far: %lu\n"
-msgstr "目前建立的簽章: %lu\n"
+msgid "error running `%s': probably not installed\n"
+msgstr ""
+
+#: common/exechelp.c:498
+#, fuzzy, c-format
+msgid "error running `%s': terminated\n"
+msgstr "讀取 `%s' 時發生錯誤: %s\n"
+
+#: common/http.c:1622
+#, fuzzy, c-format
+msgid "error creating socket: %s\n"
+msgstr "建立 `%s' 時發生錯誤: %s\n"
+
+#: common/http.c:1666
+#, fuzzy
+msgid "host not found"
+msgstr "[找不到使用者 ID]"
 
-#: g10/app-openpgp.c:2142
+#: common/simple-pwquery.c:310 g10/passphrase.c:310
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent 在此階段無法使用\n"
+
+#: common/simple-pwquery.c:368 g10/passphrase.c:362
 #, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
+msgid "can't connect to `%s': %s\n"
+msgstr "無法連接至 `%s': %s\n"
 
-#: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
-msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止了\n"
+#: common/simple-pwquery.c:379
+msgid "communication problem with gpg-agent\n"
+msgstr ""
+
+#: common/simple-pwquery.c:389
+msgid "problem setting the gpg-agent options\n"
+msgstr ""
+
+#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#, fuzzy
+msgid "canceled by user\n"
+msgstr "由使用者取消了\n"
+
+#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#, fuzzy
+msgid "problem with the agent\n"
+msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: common/sysutils.c:88 g10/misc.c:137
 #, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
+msgid "can't disable core dumps: %s\n"
+msgstr "無法讓系統停止傾印核心檔: %s\n"
+
+#: common/sysutils.c:183
+#, fuzzy, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
+
+#: common/sysutils.c:215
+#, fuzzy, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:33 common/yesno.c:70
+msgid "yes"
+msgstr "yes"
+
+#: common/yesno.c:34 common/yesno.c:75
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:36 common/yesno.c:72
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:37 common/yesno.c:76
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:74
+msgid "quit"
+msgstr "quit"
+
+#: common/yesno.c:77
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:111
+msgid "okay|okay"
+msgstr "okay|okay"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:113
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: common/yesno.c:114
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:115
+msgid "cC"
+msgstr "cC"
 
 #: g10/armor.c:320
 #, c-format
@@ -376,163 +805,197 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/build-packet.c:944
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
+
+#: g10/build-packet.c:956
+msgid "a user notation name must contain the '@' character\n"
+msgstr "使用者標記名稱一定要含有 '@' 字符\n"
+
+#: g10/build-packet.c:962
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
+
+#: g10/build-packet.c:980
+msgid "a notation value must not use any control characters\n"
+msgstr "標記值一定不能使用任何的控制字符\n"
+
+#: g10/build-packet.c:1014 g10/build-packet.c:1023
+msgid "WARNING: invalid notation data found\n"
+msgstr "警告: 找到無效的標記資料\n"
+
+#: g10/build-packet.c:1045 g10/build-packet.c:1047
+msgid "not human readable"
+msgstr "不是人類能讀得懂的"
+
+#: g10/call-agent.c:99 sm/call-agent.c:102
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: g10/call-agent.c:160 sm/call-agent.c:167
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: g10/card-util.c:64 g10/card-util.c:307
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
+#: g10/keygen.c:2737 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
-#: g10/keygen.c:1448
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:414
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "未特定"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:442
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:520
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字元.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字元.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的教名: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:561
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:590
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr " 登入資料 (帳號名稱): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:706
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "錯誤: 登入資料太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:775
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:795
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:803
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 偏好設定字串的長度無效\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:812
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字元\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性別 ((M)ale, (F)emale 或留空): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:847
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:868
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:891
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 指紋格式化無效.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:939
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1055 g10/card-util.c:1064
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -543,191 +1006,139 @@ msgstr ""
 "   PIN = `%s'     管理者 (Admin) PIN = `%s'\n"
 "妳應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1120
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇妳要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "未知的金鑰保護演算法\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放於卡片上了\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1316 g10/keyedit.c:1358
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1319 g10/keyedit.c:1361
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "變更要取回金鑰的 URL"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "變更登入姓名"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 指紋"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章強制個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1454 g10/keyedit.c:1624
 msgid "Command> "
 msgstr "指令> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1599 g10/keyedit.c:2245
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/cardglue.c:416
-#, fuzzy
-msgid "card reader not available\n"
-msgstr "無法取用私鑰"
-
-#: g10/cardglue.c:434
-msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 以取消: "
-
-#: g10/cardglue.c:446
-#, fuzzy, c-format
-msgid "selecting openpgp failed: %s\n"
-msgstr "刪除金鑰區塊時失敗了: %s\n"
-
-#: g10/cardglue.c:573
-#, c-format
-msgid ""
-"Please remove the current card and insert the one with serial number:\n"
-"   %.*s\n"
-msgstr ""
-"請移除現用中的卡片並插入下列序號的卡片:\n"
-"   %.*s\n"
-
-#: g10/cardglue.c:582
-msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr "準備好時請按下 [Enter], 或者輸入 'c' 以取消: "
-
-#: g10/cardglue.c:917
-msgid "Enter New Admin PIN: "
-msgstr "請輸入新的管理者個人識別碼 (PIN): "
-
-#: g10/cardglue.c:918
-msgid "Enter New PIN: "
-msgstr "請輸入新的個人識別碼 (PIN): "
-
-#: g10/cardglue.c:919
-msgid "Enter Admin PIN: "
-msgstr "請輸入管理者個人識別碼 (PIN): "
-
-#: g10/cardglue.c:920
-msgid "Enter PIN: "
-msgstr "請輸入個人識別碼 (PIN): "
-
-#: g10/cardglue.c:937
-msgid "Repeat this PIN: "
-msgstr "請再次輸入個人識別碼 (PIN): "
-
-#: g10/cardglue.c:952
-msgid "PIN not correctly repeated; try again"
-msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
+#: g10/decrypt.c:107 g10/encode.c:850
+msgid "--output doesn't work for this command\n"
+msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
-msgid "--output doesn't work for this command\n"
-msgstr "--output 在這個命令中沒有作用\n"
-
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3388 g10/keyserver.c:1709
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714
+#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1723
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -767,214 +1178,247 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:213 g10/sign.c:1284
+#: g10/encode.c:222 g10/sign.c:1291
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:227
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "因為處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:241
 #, c-format
 msgid "using cipher %s\n"
 msgstr "正在使用編密法 %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:251 g10/encode.c:547
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:302 g10/encode.c:595 g10/sign.c:596
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是一個空檔案\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:466
 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
+#: g10/encode.c:491
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "正在從 `%s' 讀取中\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:519
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "妳正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:529
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:639 g10/sign.c:968
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告: 強迫使用壓縮演算法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:725
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:795 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:822
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已經加密給: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:69 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密過的資料\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:71 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的演算法 %d 加密過\n"
 
-#: g10/encr-data.c:93
+#: g10/encr-data.c:108 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊息被以對稱式編密法的弱金鑰加密了.\n"
 
-#: g10/encr-data.c:104
+#: g10/encr-data.c:119
 msgid "problem handling encrypted packet\n"
 msgstr "處理加密的封包有問題\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "沒有已支援的遠端程式執行\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
-#, c-format
-msgid "can't create directory `%s': %s\n"
-msgstr "無法建立目錄 `%s': %s\n"
-
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "無法執行程式 `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "無法執行 shell `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "叫用外部程式時發生系統錯誤: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "外部程式不自然地離開\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "無法執行外部程式\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "無法讀取外部程式回應: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告: 無法移除暫存檔 (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告: 無法移除暫存目錄 `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:63
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/export.c:63
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:67
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 
-#: g10/export.c:67
+#: g10/export.c:69
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/export.c:69
+#: g10/export.c:71
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "從金鑰中清除無法使用的部分"
 
-#: g10/export.c:71
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:75
+msgid "export keys in an S-expression based format"
+msgstr ""
+
+#: g10/export.c:339
 msgid "exporting secret keys not allowed\n"
 msgstr "未被允許匯出私鑰\n"
 
-#: g10/export.c:354
+#: g10/export.c:368
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "金鑰 %s: 未被保護 - 已跳過\n"
 
-#: g10/export.c:362
+#: g10/export.c:376
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n"
 
-#: g10/export.c:373
+#: g10/export.c:387
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/export.c:521
+#: g10/export.c:538
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:561
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:565
+#: g10/export.c:582
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
 
-#: g10/export.c:598
+#: g10/export.c:631
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何東西\n"
 
-#: g10/gpg.c:375
+#: g10/getkey.c:153
+msgid "too many entries in pk cache - disabled\n"
+msgstr "pk 快取裡有太多項目 - 已禁用\n"
+
+#: g10/getkey.c:176
+msgid "[User ID not found]"
+msgstr "[找不到使用者 ID]"
+
+#: g10/getkey.c:949 g10/getkey.c:959 g10/getkey.c:969 g10/getkey.c:985
+#: g10/getkey.c:1000
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1827
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
+
+#: g10/getkey.c:2381 g10/keyedit.c:3708
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
+
+#: g10/getkey.c:2612
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
+
+#: g10/getkey.c:2659
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
+
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -982,127 +1426,128 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: g10/gpg.c:377
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:371 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:376 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:378 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:380 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:384 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:385 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:386 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "產生一份新的金鑰對"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "簽署某把金鑰"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "僅在本地簽署某把金鑰"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "簽署或編輯某把金鑰"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "產生一份撤銷憑證"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:396 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:397 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "從某個金鑰伺服器上更新所有的金鑰"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:416
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "變更某張卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:426
+#: g10/gpg.c:418
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:433
+#: g10/gpg.c:425
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
 "Options:\n"
@@ -1112,51 +1557,47 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:439
+#: g10/gpg.c:431 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:433 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:452
+#: g10/gpg.c:444 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:453
+#: g10/gpg.c:445 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:450 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
-msgid "verbose"
-msgstr "囉唆模式"
-
-#: g10/gpg.c:485
+#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:478
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:520
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:528
+#: g10/gpg.c:521
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:549 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1164,7 +1605,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:559
+#: g10/gpg.c:552 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1184,15 +1625,15 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:745 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: g10/gpg.c:774
+#: g10/gpg.c:762
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:765
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1202,7 +1643,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:788
+#: g10/gpg.c:776 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1210,624 +1651,566 @@ msgstr ""
 "\n"
 "已被支援的演算法:\n"
 
-#: g10/gpg.c:791
+#: g10/gpg.c:779
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:786 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:803
+#: g10/gpg.c:793
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:800 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:892
+#: g10/gpg.c:884
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1058
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1258
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1438
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1944
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:1962
-#, c-format
-msgid "NOTE: no default option file `%s'\n"
-msgstr "請注意: 沒有預設選項檔 `%s'\n"
-
-#: g10/gpg.c:1966
-#, c-format
-msgid "option file `%s': %s\n"
-msgstr "選項檔 `%s': %s\n"
-
-#: g10/gpg.c:1973
-#, c-format
-msgid "reading options from `%s'\n"
-msgstr "從 `%s' 讀取選項\n"
-
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2201
+#: g10/gpg.c:2216
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
+#: g10/gpg.c:2368 g10/gpg.c:2380
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2452
+#: g10/gpg.c:2462
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2488
+#: g10/gpg.c:2497
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2491
+#: g10/gpg.c:2500
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2498
+#: g10/gpg.c:2507
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2510
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2508
+#: g10/gpg.c:2517
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2511
+#: g10/gpg.c:2520
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2518
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2521
+#: g10/gpg.c:2530
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2529
+#: g10/gpg.c:2538
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2540
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2542
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2535
+#: g10/gpg.c:2544
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2548
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2552
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2545
+#: g10/gpg.c:2554
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2556
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2558
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2568
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2575
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2749
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2732
+#: g10/gpg.c:2752
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2803
+#: g10/gpg.c:2835 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2839
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2848
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2819
+#: g10/gpg.c:2851
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2826
-#, c-format
-msgid "NOTE: %s is not available in this version\n"
-msgstr "注意: %s 在本版中無法使用\n"
-
-#: g10/gpg.c:2841
+#: g10/gpg.c:2866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2880
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2886
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2892
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2905
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:2959
+#: g10/gpg.c:2983
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:2965
+#: g10/gpg.c:2989
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3004
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:2982
+#: g10/gpg.c:3006
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:2984
+#: g10/gpg.c:3008
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:2986
+#: g10/gpg.c:3010
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:3012
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3015
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:2995
+#: g10/gpg.c:3019
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3002
+#: g10/gpg.c:3026
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3035
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3039
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3043
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3076
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3099
+#: g10/gpg.c:3123
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3104
+#: g10/gpg.c:3128
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3133
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3231
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3242
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3253
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3260
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3262
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3249
+#: g10/gpg.c:3272
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3285
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3290
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3308
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3321
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3336
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3318
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3361
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3370
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3395
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3403
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3384
+#: g10/gpg.c:3407
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3428
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3499
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
 
-#: g10/gpg.c:3518
+#: g10/gpg.c:3541
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3543
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3545
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3533
+#: g10/gpg.c:3556
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3594
+#: g10/gpg.c:3617
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3602
+#: g10/gpg.c:3625
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3715
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3832
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3836
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:4120
+#: g10/gpg.c:4147
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4122
+#: g10/gpg.c:4149
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4155
+#: g10/gpg.c:4182
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/getkey.c:152
-msgid "too many entries in pk cache - disabled\n"
-msgstr "pk 快取裡有太多項目 - 已禁用\n"
-
-#: g10/getkey.c:175
-msgid "[User ID not found]"
-msgstr "[找不到使用者 ID]"
-
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
-#, c-format
-msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
-
-#: g10/getkey.c:1826
-#, c-format
-msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
-
-#: g10/getkey.c:2380 g10/keyedit.c:3707
-#, c-format
-msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
-
-#: g10/getkey.c:2611
-#, c-format
-msgid "using subkey %s instead of primary key %s\n"
-msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
-
-#: g10/getkey.c:2658
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
-
-#: g10/gpgv.c:74
-msgid "be somewhat more quiet"
-msgstr "盡量安靜些"
-
-#: g10/gpgv.c:75
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "從這個鑰匙圈裡取用金鑰"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:78
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此檔案描述"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1835,7 +2218,7 @@ msgstr ""
 "語法: gpg [選項] [檔案]\n"
 "用已知的受信任金鑰來檢查簽章\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:51
 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"
@@ -1844,7 +2227,7 @@ msgstr ""
 "在這裡指派的數值完全是看妳自己決定; 這些數值永遠不會被匯出給其他人.\n"
 "我們需要它來實施信任網絡; 這跟 (自動建立起的) 憑證網絡一點關係也沒有."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:57
 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"
@@ -1855,16 +2238,16 @@ msgstr ""
 "那些金鑰通常就是妳有辦法存取到私鑰的. 回答 \"yes\" 來將這些\n"
 "金鑰設成被徹底信任的\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果妳無論如何想要使用這把未被信任的金鑰, 請回答 \"yes\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:68
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "輸入妳要遞送的訊息接收者的使用者 ID."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1888,7 +2271,7 @@ msgstr ""
 "\n"
 "第一把 (主要的) 金鑰一定要含有能用於簽署的金鑰."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:86
 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"
@@ -1898,16 +2281,16 @@ msgstr ""
 "這個演算法應該祇被用於特定的情況下.\n"
 "請先聯絡妳的安全專家."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "請輸入金鑰的尺寸"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "請回答 \"yes\" 或 \"no\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:107
 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"
@@ -1918,19 +2301,19 @@ msgstr ""
 "妳可以輸入 ISO 日期格式 (YYYY-MM-DD), 但是不會得到良好的錯誤回應 -\n"
 "反之, 系統會試著把給定的數值中斷成若干片段."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "請輸入金鑰持有人的名字"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "請輸入選用 (但強烈建議使用) 的電子郵件位址"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "請輸入選用的註釋"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1944,11 +2327,11 @@ msgstr ""
 "O  繼續產生金鑰.\n"
 "Q  中止產生金鑰."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:142
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "如果妳覺得產生子鑰可以的話, 就回答 \"yes\" (或者祇要 \"y\")."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:150
 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"
@@ -2017,11 +2400,11 @@ msgstr ""
 "\n"
 "如果妳不知道應該選甚麼答案的話, 就選 \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "如果妳想要簽署 *所有* 使用者 ID 的話就回答 \"yes\""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2029,11 +2412,11 @@ msgstr ""
 "如果妳真的想要刪除這個使用者 ID 的話就回答 \"yes\".\n"
 "所有的憑證在那之後也都會失去!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "如果刪除這把子鑰沒問題的話就回答 \"yes\""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:202
 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"
@@ -2043,7 +2426,7 @@ msgstr ""
 "因為要跟別的金鑰建立起信任連結, 或由這把金鑰所簽署的金鑰憑證\n"
 "會是一件相當重要的事."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2054,13 +2437,13 @@ msgstr ""
 "直到妳知道哪一把金鑰被使用了; 因為這把來簽署的金鑰可能透過\n"
 "其他已經驗證的金鑰建立了一個信任連結."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "這份簽章無效. 把它從妳的鑰匙圈裡移去相當合理."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:217
 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"
@@ -2074,7 +2457,7 @@ msgstr ""
 "把金鑰的第一個自我簽章因某些原因無效, 而第二\n"
 "個還可用的情況下纔這麼做."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:225
 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"
@@ -2083,23 +2466,23 @@ msgstr ""
 "變更所有 (或祇有被選取的那幾個) 使用者 ID 的偏好成現用的偏好清單.\n"
 "所有受到影響的自我簽章的時間戳記都會增加一秒鐘.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "請再次輸入最後的密語, 以確定妳到底鍵進了些甚麼."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "請給定簽章所要套用的檔案名稱"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "如果覆寫這個檔案沒有問題的話就回答 \"yes\""
 
-#: g10/helptext.c:250
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2107,7 +2490,7 @@ msgstr ""
 "請輸入一個新的檔名. 如果妳直接按下了 Enter, 那麼\n"
 "就會使用預設的檔案 (顯示在括號中)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2135,7 +2518,7 @@ msgstr ""
 "      如果這個使用者 ID 不再被使用了, 就選這個;\n"
 "      這通常用來表示某個電子郵件位址不再有效了.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2145,11 +2528,11 @@ msgstr ""
 "請讓這段文字保持簡明扼要.\n"
 "鍵入空白列以結束這段文字.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "沒有可用的說明"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' 沒有可用的說明"
@@ -2185,356 +2568,351 @@ msgstr "從金鑰中清除無法使用的部分"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:266
+#: g10/import.c:268
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "正在跳過 %d 型態的區塊\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "已有 %lu 把金鑰被處理了\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "總共被處理的數量: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        已跳過的新金鑰: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:299
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       沒有使用者的 ID: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:301 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                已匯入: %lu"
 
-#: g10/import.c:305
+#: g10/import.c:307 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              未改變的: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:309
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         新的使用者 ID: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:311
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              新的子鑰: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:313
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              新的簽章: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:315
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          新的金鑰撤銷: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:317 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "          被讀取的私鑰: %lu\n"
 
-#: g10/import.c:317
+#: g10/import.c:319 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "          已匯入的私鑰: %lu\n"
 
-#: g10/import.c:319
+#: g10/import.c:321 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "          未改變的私鑰: %lu\n"
 
-#: g10/import.c:321
+#: g10/import.c:323 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              未被匯入: %lu\n"
 
-#: g10/import.c:323
+#: g10/import.c:325
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "      已被清除掉的簽章: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:327
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " 已被清除掉的使用者 ID: %lu\n"
 
-#: g10/import.c:566
-#, c-format
-msgid "WARNING: key %s contains preferences for unavailable\n"
+#: g10/import.c:568
+#, fuzzy, c-format
+msgid ""
+"WARNING: key %s contains preferences for unavailable\n"
+"algorithms on these user IDs:\n"
 msgstr "警告: 金鑰 %s 含有不可用的偏好設定\n"
 
-#. TRANSLATORS: This string is belongs to the previous one.  They are
-#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
-#, fuzzy
-msgid "         algorithms on these user IDs:\n"
-msgstr "這些使用者 ID 上的演算法:\n"
-
-#: g10/import.c:607
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
 
-#: g10/import.c:619
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
 
-#: g10/import.c:631
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 
-#: g10/import.c:644
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "我們強烈建議妳更新妳的偏好設定, 並\n"
 
-#: g10/import.c:646
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "重新散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 
-#: g10/import.c:670
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "妳可以像這樣更新妳的偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:749
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 
-#: g10/import.c:764
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "金鑰 %s: 非自我簽署的使用者 ID \"%s\" 已被接受\n"
 
-#: g10/import.c:770
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:772
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能是由於遺失自我簽章所導致的後果\n"
 
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
 
-#: g10/import.c:788
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 
-#: g10/import.c:797
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:801 g10/openfile.c:268 g10/sign.c:834 g10/sign.c:1140
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
 
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2362 g10/import.c:2384
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/import.c:825
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已被匯入\n"
 
-#: g10/import.c:849
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定位原始的金鑰區塊: %s\n"
 
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:911
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:914
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:917
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的簽章\n"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
 
-#: g10/import.c:923
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的子鑰\n"
 
-#: g10/import.c:926
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的子鑰\n"
 
-#: g10/import.c:929
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:932
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:935
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:938
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:961
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 沒有被改變\n"
 
-#: g10/import.c:1124
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "未被允許匯入私鑰\n"
 
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1151 g10/import.c:2377
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
 
-#: g10/import.c:1163
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: 私鑰被匯入了\n"
 
-#: g10/import.c:1193
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "金鑰 %s: 已經在私鑰鑰匙圈中了\n"
 
-#: g10/import.c:1203
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "金鑰 %s: 找不到私鑰: %s\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:1276
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已被匯入\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 使用了未被支援的公鑰演算法\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 有無效的自我簽章\n"
 
-#: g10/import.c:1409
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有子鑰可供附帶\n"
 
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未被支援的公鑰演算法\n"
 
-#: g10/import.c:1422
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:1437
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多重附帶子鑰已被移除\n"
 
-#: g10/import.c:1459
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:1472
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:1487
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:1529
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:1550
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: 子鑰已跳過\n"
@@ -2543,133 +2921,133 @@ msgstr "金鑰 %s: 子鑰已跳過\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1577
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
 
-#: g10/import.c:1587
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1604
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1626
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:1726
+#: g10/import.c:1725
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1787
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:1802
+#: g10/import.c:1801
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:1861
+#: g10/import.c:1860
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:1895
+#: g10/import.c:1894
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2283
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "請注意: 某份金鑰的序號 (S/N) 與卡片的序號並不吻合\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2291
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
 
-#: g10/import.c:2294
+#: g10/import.c:2293
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "請注意: 次鑰在線上且已存放於卡片上了\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "鑰匙圈 `%s' 已建立\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:317 g10/keydb.c:320
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "金鑰區塊資源 `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[撤銷]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 個損壞的簽章\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 個損壞的簽章\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份簽章因為某個錯誤而未被檢查\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份簽章因為某些錯誤而未被檢查\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2679,17 +3057,17 @@ msgstr ""
 "請判斷妳有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:440
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2699,45 +3077,45 @@ msgstr ""
 "深度大於 1 的話就表示妳信任這把正被簽署的金鑰,\n"
 "同時也信任這把金鑰所簽署的信任簽章.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已經被撤銷了."
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1743
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "妳仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1749
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "使用者 ID \"%s\" 已經過期了."
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "使用者 ID \"%s\" 未經自我簽署."
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "使用者 ID \"%s\" 可被簽署."
 
-#: g10/keyedit.c:685
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "是否要簽署? (y/N) "
 
-#: g10/keyedit.c:707
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2746,11 +3124,11 @@ msgstr ""
 "\"%s\" 裡的自我簽章\n"
 "是 PGP 2.x 型態的簽章.\n"
 
-#: g10/keyedit.c:716
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "妳是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2759,11 +3137,11 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "已經過期了.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "妳想要發佈一份新的簽章來取代已過期的那一個嗎? (y/N) "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2772,53 +3150,53 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "是一份本地簽章.\n"
 
-#: g10/keyedit.c:759
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "妳是否想要把他升級成可以完全匯出的簽章? (y/N) "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 在本地簽署了\n"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "妳仍然想要再次簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "這把金鑰已經過期了!"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "這把金鑰將在 %s 過期.\n"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "妳想要讓妳的簽章也在同一個時候過期嗎? (Y/n) "
 
-#: g10/keyedit.c:889
+#: g10/keyedit.c:890
 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:891
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "這會讓這把金鑰在 PGP 2.x 模式下不可使用.\n"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2827,31 +3205,31 @@ msgstr ""
 "妳有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
 "如果妳不知道這個問題的答案, 請輸入 \"0\".\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答.%s\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本沒有檢查過.%s\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我隨意檢查過了.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地檢查過了.%s\n"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr "妳的選擇是? (輸入 `?' 以取得更多資訊): "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2860,74 +3238,74 @@ msgstr ""
 "妳真的確定要用妳的金鑰 \"%s\" (%s)\n"
 "來簽署這把金鑰嗎\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "這份簽章會被標記成不可匯出.\n"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr "我根本沒有檢查過這把金鑰.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr "我隨意檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4784 g10/keyedit.c:4875 g10/keyedit.c:4939
+#: g10/keyedit.c:5000 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上 (on-card) 金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1144 g10/keygen.c:3380
 msgid "This key is not protected.\n"
 msgstr "這把金鑰沒有被保護.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3368 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分沒辦法取用.\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1152 g10/keygen.c:3383
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上 (on-card).\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1156 g10/keygen.c:3387
 msgid "Key is protected.\n"
 msgstr "金鑰被保護了.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "無法編輯這把金鑰: %s\n"
 
-#: g10/keyedit.c:1185
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2935,11 +3313,11 @@ msgstr ""
 "輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1195 g10/keygen.c:2065
 msgid "passphrase not correctly repeated; try again"
 msgstr "密語再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1200
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2947,186 +3325,186 @@ msgstr ""
 "妳不想要用密語 - 這大概是個 *糟* 點子!\n"
 "\n"
 
-#: g10/keyedit.c:1202
+#: g10/keyedit.c:1203
 msgid "Do you really want to do this? (y/N) "
 msgstr "妳真的想要這麼做嗎? (y/N) "
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1360
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1363
 msgid "show key fingerprint"
 msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1364
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "select user ID N"
 msgstr "使用者 ID 選了 N"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "select subkey N"
 msgstr "選擇次鑰 N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1368
 msgid "check signatures"
 msgstr "檢查簽章"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "簽署所選的使用者 ID [* 請參見底下有關的註解]"
 
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1378
 msgid "sign selected user IDs locally"
 msgstr "僅在本地簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1380
 msgid "sign selected user IDs with a trust signature"
 msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1382
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1386
 msgid "add a user ID"
 msgstr "增加一個使用者 ID"
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1388
 msgid "add a photo ID"
 msgstr "增加一個照片 ID"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1390
 msgid "delete selected user IDs"
 msgstr "刪除所選的使用者 ID"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 msgid "add a subkey"
 msgstr "增加一把次鑰"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "add a key to a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1401
 msgid "move a key to a smartcard"
 msgstr "移動某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1403
 msgid "move a backup key to a smartcard"
 msgstr "移動某把備份金鑰至智慧卡"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1407
 msgid "delete selected subkeys"
 msgstr "刪除所選的次鑰"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1409
 msgid "add a revocation key"
 msgstr "增加一把撤銷金鑰"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1411
 msgid "delete signatures from the selected user IDs"
 msgstr "從所選的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1413
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "從金鑰或所選的次鑰中變更使用期限"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1415
 msgid "flag the selected user ID as primary"
 msgstr "把所選的使用者 ID 標為主要"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
 msgid "toggle between the secret and public key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
 msgid "list preferences (expert)"
 msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1422
 msgid "list preferences (verbose)"
 msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1424
 msgid "set preference list for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1429
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好金鑰伺服器 URL"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1437
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1439
 msgid "revoke signatures on the selected user IDs"
 msgstr "從所選的使用者 ID 上撤銷簽章"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1441
 msgid "revoke selected user IDs"
 msgstr "撤銷所選的使用者 ID"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1446
 msgid "revoke key or selected subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1447
 msgid "enable key"
 msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1448
 msgid "disable key"
 msgstr "禁用金鑰"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1449
 msgid "show selected photo IDs"
 msgstr "顯示所選的照片 ID"
 
-#: g10/keyedit.c:1450
+#: g10/keyedit.c:1451
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1453
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1571
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "讀取私鑰區塊 \"%s\" 時出錯: %s\n"
 
-#: g10/keyedit.c:1588
+#: g10/keyedit.c:1589
 msgid "Secret key is available.\n"
 msgstr "私鑰可用.\n"
 
-#: g10/keyedit.c:1669
+#: g10/keyedit.c:1670
 msgid "Need the secret key to do this.\n"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3137,154 +3515,154 @@ msgstr ""
 "  加上 `t' 的話就是信任簽章 (tsign), 加上 `nr' 的話就是不可撤銷簽章\n"
 "  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1736
+#: g10/keyedit.c:1737
 msgid "Key is revoked."
 msgstr "金鑰已經被撤銷了."
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1762
+#: g10/keyedit.c:1763
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1772
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的簽章種類 `%s'\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1795
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1817 g10/keyedit.c:1837 g10/keyedit.c:2003
 msgid "You must select at least one user ID.\n"
 msgstr "妳至少得選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1819
 msgid "You can't delete the last user ID!\n"
 msgstr "妳不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1820
+#: g10/keyedit.c:1821
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1822
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1871
+#: g10/keyedit.c:1872
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移動主要金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1883
+#: g10/keyedit.c:1884
 msgid "You must select exactly one key.\n"
 msgstr "妳一定祇得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1911
+#: g10/keyedit.c:1912
 msgid "Command expects a filename argument\n"
 msgstr "這項指令應該要拿一個檔名當作參數\n"
 
-#: g10/keyedit.c:1925
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:1943
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "從 `%s' 讀取備份金鑰時發生錯誤: %s\n"
 
-#: g10/keyedit.c:1966
+#: g10/keyedit.c:1967
 msgid "You must select at least one key.\n"
 msgstr "妳至少必須選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1970
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "妳真的想要刪除被選擇的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1970
+#: g10/keyedit.c:1971
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "妳真的要刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2005
+#: g10/keyedit.c:2006
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2007
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2025
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "妳真的想要撤銷這整把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2036
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "妳真的想要撤銷這些被選擇的次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2037
+#: g10/keyedit.c:2038
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "妳真的想要撤銷這把次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2088
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2130
 msgid "Set preference list to:\n"
 msgstr "設定偏好清單至:\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2136
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2138
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2205
+#: g10/keyedit.c:2206
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2209
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2219
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2225
+#: g10/keyedit.c:2226
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2333
+#: g10/keyedit.c:2334
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2385
+#: g10/keyedit.c:2386
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2397
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2412 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#: g10/keyedit.c:2420 g10/keyedit.c:2421
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3292,73 +3670,73 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/keyedit.c:2630
+#: g10/keyedit.c:2631
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好.\n"
 
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2690
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 給撤銷了\n"
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2711
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
 
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2717
 msgid "(sensitive)"
 msgstr "(機密的)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2733 g10/keyedit.c:2789 g10/keyedit.c:2850 g10/keyedit.c:2865
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "建立於: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2736 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
 #, c-format
 msgid "revoked: %s"
 msgstr "已撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2738 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "已過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keyedit.c:2740 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
 #, c-format
 msgid "expires: %s"
 msgstr "過期: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2742
 #, c-format
 msgid "usage: %s"
 msgstr "用法: %s"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2757
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2761
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "This key has been disabled"
 msgstr "這把金鑰已經被禁用了"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2796 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2819
+#: g10/keyedit.c:2820
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3366,17 +3744,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2884 g10/keyedit.c:3230 g10/keyserver.c:526
+#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:530
+#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:2950
+#: g10/keyedit.c:2951
 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"
@@ -3384,7 +3762,7 @@ msgstr ""
 "警告: 沒有任何使用者 ID 已被標示為主要 ID. 這項指令可能\n"
 "      會導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:3011
+#: g10/keyedit.c:3012
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3393,54 +3771,54 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3017 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3023
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3162
+#: g10/keyedit.c:3163
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這個完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3173
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這個無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3176
+#: g10/keyedit.c:3177
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這個未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3183
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這個自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3196
+#: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3197
+#: g10/keyedit.c:3198
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3201
 msgid "Nothing deleted.\n"
 msgstr "沒有東西被刪除.\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
+#: g10/keyedit.c:3234 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3449,360 +3827,365 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3398
 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:3412
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "這把金鑰已被指定為撤銷者了\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3521
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3527
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把次鑰.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3531
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更某把次鑰的使用期限.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3534
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3580
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3596
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3669
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
 
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3675
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3837
 msgid "Please select exactly one user ID.\n"
 msgstr "請精確地選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3876 g10/keyedit.c:3986 g10/keyedit.c:4106 g10/keyedit.c:4247
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4047
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4128
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4190
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "簽章標記: "
 
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4339
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "是否覆寫? (y/N) "
 
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4403
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4461
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4488
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到次鑰\n"
 
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4623
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4626 g10/keyedit.c:4690 g10/keyedit.c:4733
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4632
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽署已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4636
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4667
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4693
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4700
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4722
 msgid "You are about to revoke these signatures:\n"
 msgstr "妳正在撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4772
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4842
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4859
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4923
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4985
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "次鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5080
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
 
-#: g10/keygen.c:262
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "偏好設定 `%s' 重複了\n"
 
-#: g10/keygen.c:269
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "編密偏好過多\n"
 
-#: g10/keygen.c:271
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "摘要偏好過多\n"
 
-#: g10/keygen.c:273
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "壓縮偏好過多\n"
 
-#: g10/keygen.c:398
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "偏好字串中含有無效的 `%s' 項目\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "正在寫入直接簽章\n"
 
-#: g10/keygen.c:911
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "正在寫入自我簽章\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "正在寫入附鑰簽章\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
-#: g10/keygen.c:2762
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2931
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2937
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
 
-#: g10/keygen.c:1323
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr "簽署"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1498
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1332
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr "鑑定"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 金鑰可能的動作: "
 
-#: g10/keygen.c:1363
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr "目前可進行的動作: "
 
-#: g10/keygen.c:1368
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 切換簽署性能\n"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 切換加密性能\n"
 
-#: g10/keygen.c:1374
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 切換鑑定性能\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1433
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇妳要使用的金鑰種類:\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 Elgamal (預設)\n"
 
-#: g10/keygen.c:1436
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1438
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (僅能加密用)\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (僅能加密用)\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1514
+#: g10/keygen.c:1683
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 金鑰對會有 %u 位元長.\n"
 
-#: g10/keygen.c:1524
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:1531
+#: g10/keygen.c:1700
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "妳想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1545
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 
-#: g10/keygen.c:1551
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "妳所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:1610
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3818,7 +4201,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會過期\n"
 "      <n>y = 金鑰在 n 年後會過期\n"
 
-#: g10/keygen.c:1621
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3834,38 +4217,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會過期\n"
 "      <n>y = 簽章在 n 年後會過期\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:1649
+#: g10/keygen.c:1818
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1667
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:1674
+#: g10/keygen.c:1843
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:1675
+#: g10/keygen.c:1844
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1849
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 過期\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1850
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 過期.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1856
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3873,11 +4256,11 @@ msgstr ""
 "妳的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1692
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1715
+#: g10/keygen.c:1884
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3892,44 +4275,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:1740
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:1748
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:1754
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:1768
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:1791
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "妳正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3940,7 +4323,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1802
+#: g10/keygen.c:1970
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 
@@ -3955,23 +4338,23 @@ msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1818
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1828
+#: g10/keygen.c:1996
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:1829
+#: g10/keygen.c:1997
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:1848
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:2056
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3979,12 +4362,12 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:2066 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:2072
 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"
@@ -3996,7 +4379,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:1926
+#: g10/keygen.c:2094
 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"
@@ -4007,50 +4390,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:2708
+#: g10/keygen.c:2876
 msgid "Key generation canceled.\n"
 msgstr "已取消金鑰產生.\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:3088 g10/keygen.c:3233
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在將公鑰寫至 `%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:3090 g10/keygen.c:3236
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:3093 g10/keygen.c:3239
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3222
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3228
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3065
+#: g10/keygen.c:3246
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3072
+#: g10/keygen.c:3253
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3276
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已經被建立及簽署了.\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3287
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4058,47 +4441,47 @@ msgstr ""
 "請注意這把金鑰不能用於加密之用.  也許妳會想藉由 \"--edit-key\" \n"
 "指令來產生加密用的次鑰.\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3299 g10/keygen.c:3428 g10/keygen.c:3544
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3351 g10/keygen.c:3479 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3353 g10/keygen.c:3481 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3362 g10/keygen.c:3492
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3401 g10/keygen.c:3525
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3509
+#: g10/keygen.c:3688
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3556
+#: g10/keygen.c:3736
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3582
+#: g10/keygen.c:3762
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "永遠不過期"
 
@@ -4126,616 +4509,589 @@ msgstr "簽章標記: "
 msgid "Keyring"
 msgstr "鑰匙圈"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "               主鑰指紋:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "               子鑰指紋:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr "                主鑰指紋:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "                子鑰指紋:"
 
 #  use tty
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1521 g10/keylist.c:1525
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr "      卡片序號 ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1251
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "把 `%s' 重新新命成 `%s' 時失敗: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告: 2 個檔案存在有互相矛盾的資訊.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是沒有改變的那一個\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一個\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "請修補這個可能的安全性裂縫\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1382
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "正在快取鑰匙圈 `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1428
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1440
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: 鑰匙圈已建立\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:77
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告: 金鑰伺服器選項 `%s' 並未用於此平台\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)ext, 或 Q)uit > "
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:813 g10/keyserver.c:1430
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d != 經手程式 %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:911
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:913
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1154
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1185
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1324
+#: g10/keyserver.c:1333
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1337
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1371
+#: g10/keyserver.c:1380
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1383
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1390 g10/keyserver.c:1486
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1438
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1447
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1509 g10/keyserver.c:2037
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
-#: g10/keyserver.c:1506
+#: g10/keyserver.c:1515
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "本版並不支援外部金鑰伺服器叫用\n"
 
-#: g10/keyserver.c:1518
+#: g10/keyserver.c:1527
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1532
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1540
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 並不支援經手程式 (handler) 版本 %d\n"
 
-#: g10/keyserver.c:1538
+#: g10/keyserver.c:1547
 msgid "keyserver timed out\n"
 msgstr "金鑰伺服器逾時\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1552
 msgid "keyserver internal error\n"
 msgstr "金鑰伺服器內部出錯\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1561
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊出錯: %s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1586 g10/keyserver.c:1620
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 正跳過\n"
 
-#: g10/keyserver.c:1870
+#: g10/keyserver.c:1879
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1892
+#: g10/keyserver.c:1901
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "正從 %s 更新 1 份金鑰\n"
 
-#: g10/keyserver.c:1894
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "正在更新 %d 份金鑰自 %s\n"
 
-#: g10/keyserver.c:1950
+#: g10/keyserver.c:1959
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1956
+#: g10/keyserver.c:1965
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:210
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:263
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密過的階段金鑰\n"
 
-#: g10/mainproc.c:301
+#: g10/mainproc.c:273
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的摘要演算法 %d 所產生\n"
 
-#: g10/mainproc.c:382
+#: g10/mainproc.c:354
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:411
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:444
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 加密了\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:448 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 加密了\n"
 
-#: g10/mainproc.c:494
+#: g10/mainproc.c:466
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:482
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:514 g10/mainproc.c:536
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:549
+#: g10/mainproc.c:522
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:581
+#: g10/mainproc.c:555
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:559
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:598
+#: g10/mainproc.c:572
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:604
+#: g10/mainproc.c:578
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:597
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:599
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:817
+#: g10/mainproc.c:805
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1165
+#: g10/mainproc.c:1154
 #, fuzzy
 msgid "no signature found\n"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1408
+#: g10/mainproc.c:1392
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已被抑制\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1492
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處理這些多重簽章\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1503
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1520
+#: g10/mainproc.c:1504
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1508
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1528
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1661 g10/mainproc.c:1709
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1663 g10/mainproc.c:1711
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1665 g10/mainproc.c:1713
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1715
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1746
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1863
+#: g10/mainproc.c:1844
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1868
+#: g10/mainproc.c:1849
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署在 %s 過期\n"
 
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1852
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1872
+#: g10/mainproc.c:1853
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1854
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1854 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1893
+#: g10/mainproc.c:1874
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:2005
+#: g10/mainproc.c:1989
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:2013
+#: g10/mainproc.c:1997
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2070
+#: g10/mainproc.c:2056
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2066
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
-#: g10/misc.c:122
-#, c-format
-msgid "can't disable core dumps: %s\n"
-msgstr "無法讓系統停止傾印核心檔: %s\n"
-
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:336
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 正在使用實驗性的公鑰演算法 %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告: 正在使用實驗性的編密演算法 %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:366
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告: 正在使用實驗性的摘要演算法 %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:371
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告: 摘要演算法 %s 已不建議使用\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:486
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:487 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:722
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:726
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:728
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:735
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個被反對使用的指令 - 別再用了\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:796
 msgid "Uncompressed"
 msgstr "未被壓縮"
 
-#: g10/misc.c:732
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:821
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未被壓縮|無"
 
-#: g10/misc.c:842
+#: g10/misc.c:931
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1106
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的選項 `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1131
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的選項 `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "檔案 `%s' 存在. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:91
 msgid "Overwrite? (y/N) "
 msgstr "是否覆寫? (y/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: 未知的副檔名\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:146
 msgid "Enter new filename"
 msgstr "請輸入新的檔名"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:191
 msgid "writing to stdout\n"
 msgstr "正在寫入到標準輸出\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:306
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "假設被簽署的資料在 `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:385
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "新的設定檔 `%s' 被建立了\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:387
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告: 在 `%s' 裡的選項於這次執行期間並沒有被啟用\n"
 
-#: g10/openfile.c:424
-#, c-format
-msgid "directory `%s' created\n"
-msgstr "目錄 `%s' 已建立\n"
-
-#: g10/parse-packet.c:138
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "無法操作公開金鑰演算法 %d\n"
 
-#: g10/parse-packet.c:708
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
 
-#: g10/parse-packet.c:1157
+#: g10/parse-packet.c:1211
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:310
-msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent 在此階段無法使用\n"
-
-#: g10/passphrase.c:326
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
-
-#: g10/passphrase.c:345
-#, c-format
-msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "gpg-agent 協定版本 %d 未被支援\n"
-
-#: g10/passphrase.c:362
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "無法連接至 `%s': %s\n"
-
 #: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
@@ -4799,7 +5155,7 @@ msgstr "         (在主鑰 ID %s 上的子鑰)"
 msgid "Repeat passphrase: "
 msgstr "請再輸入一次密語: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4813,38 +5169,34 @@ msgstr ""
 "妳的金鑰也會變成非常地大!\n"
 "盡量把圖片尺寸控制在 240x288 左右, 會是個非常理想的大小.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "輸入要當作相片 ID 的 JPEG 檔名: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:117
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "無法開啟 JPEG 圖檔 `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "這個 JPEG 檔案真的很大 (%d 位元組) !\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:130
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "妳確定要用它嗎? (y/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' 不是一個 JPEG 圖檔\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "這張照片正確嗎? (y/N/q) "
 
-#: g10/photoid.c:329
-msgid "no photo viewer set\n"
-msgstr ""
-
-#: g10/photoid.c:383
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
 
@@ -5111,61 +5463,56 @@ msgstr "沒有有效的地址\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存它們\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
-#, c-format
-msgid "error creating `%s': %s\n"
-msgstr "建立 `%s' 時發生錯誤: %s\n"
-
-#: g10/plaintext.c:452
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "分離的簽章.\n"
 
-#: g10/plaintext.c:458
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "請輸入資料檔的名稱: "
 
-#: g10/plaintext.c:490
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "正在從標準輸入讀取 ...\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "沒有被簽署過的資料\n"
 
-#: g10/plaintext.c:538
+#: g10/plaintext.c:548
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好, 我們就是匿名收件者.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:226
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支援舊式的 DEK 編碼\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:247
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "編密演算法 %d%s 未知或已停用了\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:285
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "警告: 收件者偏好設定中找不到編密演算法 %s\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:305
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "請注意: 私鑰 %s 在 %s 過期了\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:311
 msgid "NOTE: key has been revoked"
 msgstr "請注意: 金鑰已經被撤銷了"
 
@@ -5285,146 +5632,146 @@ msgstr "(沒有給定描述)\n"
 msgid "Is this okay? (y/N) "
 msgstr "這樣可以嗎? (y/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "保護演算法 %d%s 未被支援\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "無效的密語; 請再試一次"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "警告: 偵測到金鑰薄弱 - 請再更換密語一次.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "正在產生私鑰保護會用到的舊式 16 位元加總檢查\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "建立了弱金鑰 - 正在重試\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:243
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:255
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告: 簽章摘要與訊息不一致\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告: 正要簽署的子鑰 %s 有無效的交叉憑證\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:205
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:298
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
 
-#: g10/sign.c:85
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
 
-#: g10/sign.c:93
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
 
-#: g10/sign.c:107
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告: 標記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:124
+#: g10/sign.c:125
 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:132
+#: g10/sign.c:133
 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:145
+#: g10/sign.c:146
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:174
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5441,48 +5788,48 @@ msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:790
 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:862
+#: g10/sign.c:866
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:993
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1100
+#: g10/sign.c:1105
 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:1278
+#: g10/sign.c:1285
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "已跳過 \"%s\": 重複了\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳過 \"%s\": %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "已跳過: 私鑰已經存在\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
@@ -5536,51 +5883,51 @@ msgstr "讀取 `%s' 錯誤: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本地搜尋失敗: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "信任資料庫更動量過大\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:500
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "無法存取 `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "無法為 `%s' 建立鎖定\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "無法鎖定 `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: 建立版本記錄失敗: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: 建立了無效的信任資料庫\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: 建立了信任資料庫\n"
@@ -5589,78 +5936,78 @@ msgstr "%s: 建立了信任資料庫\n"
 msgid "NOTE: trustdb not writable\n"
 msgstr "請注意: 信任資料庫不可寫入\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無效的信任資料庫\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: 建立雜湊表失敗: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀取版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任資料庫: 本地搜尋失敗: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: 不是一個信任資料庫檔案\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無效的檔案版本 %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 讀取自由記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: 記錄歸零時失敗: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: 附加某筆記錄時失敗: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任資料庫損毀了; 請執行 \"gpg --fix-trustdb\".\n"
 
@@ -5669,7 +6016,7 @@ msgstr "信任資料庫損毀了; 請執行 \"gpg --fix-trustdb\".\n"
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "無法處理長於 %d 字符的文字列\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "輸入列比 %d 字符還長\n"
@@ -5833,7 +6180,7 @@ msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:118
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5843,334 +6190,1618 @@ msgstr ""
 "請記住簽章檔 (.sig 或 .asc)\n"
 "應該是第一個命令列給定的檔案.\n"
 
-#: g10/verify.c:192
+#: g10/verify.c:195
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
 
-#: util/errors.c:55
-msgid "general error"
-msgstr "一般性錯誤"
+#: jnlib/logging.c:619
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "妳找到一個瑕疵了 ... (%s:%d)\n"
+
+#: jnlib/utf8conv.c:71
+#, c-format
+msgid "conversion from `%s' to `%s' not available\n"
+msgstr ""
 
-#: util/errors.c:56
-msgid "unknown packet type"
-msgstr "未知的封包型態"
+#: jnlib/utf8conv.c:79
+#, fuzzy, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "簽署時失敗了: %s\n"
 
-#: util/errors.c:57
-msgid "unknown version"
-msgstr "未知的版本"
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
+#, fuzzy, c-format
+msgid "conversion from `%s' to `%s' failed: %s\n"
+msgstr "把 `%s' 重新新命成 `%s' 時失敗: %s\n"
 
-#: util/errors.c:58
-msgid "unknown pubkey algorithm"
-msgstr "未知的公鑰演算法"
+#: kbx/kbxutil.c:86
+msgid "set debugging flags"
+msgstr ""
 
-#: util/errors.c:59
-msgid "unknown digest algorithm"
-msgstr "未知的摘要演算法"
+#: kbx/kbxutil.c:87
+msgid "enable full debugging"
+msgstr ""
 
-#: util/errors.c:60
-msgid "bad public key"
-msgstr "損壞的公鑰"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid "Please report bugs to "
+msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: util/errors.c:61
-msgid "bad secret key"
-msgstr "損壞的私鑰"
+#: kbx/kbxutil.c:108
+#, fuzzy
+msgid ".\n"
+msgstr "%s.\n"
 
-#: util/errors.c:62
-msgid "bad signature"
-msgstr "損壞的簽章"
+#: kbx/kbxutil.c:112
+#, fuzzy
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: util/errors.c:63
-msgid "checksum error"
-msgstr "加總檢查錯誤"
+#: kbx/kbxutil.c:115
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"list, export, import Keybox data\n"
+msgstr ""
 
-#: util/errors.c:64
-msgid "bad passphrase"
-msgstr "錯誤的密語"
+#: scd/app-nks.c:345
+msgid "the NullPIN has not yet been changed\n"
+msgstr ""
 
-#: util/errors.c:65
-msgid "public key not found"
-msgstr "找不到公鑰"
+#: scd/app-openpgp.c:596
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "存放指紋失敗: %s\n"
 
-#: util/errors.c:66
-msgid "unknown cipher algorithm"
-msgstr "未知的編密演算法"
+#: scd/app-openpgp.c:609
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "存放創生資料失敗: %s\n"
 
-#: util/errors.c:67
-msgid "can't open the keyring"
-msgstr "沒辦法開啟鑰匙圈"
+#: scd/app-openpgp.c:1004
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "讀取公鑰時失敗: %s\n"
 
-#: util/errors.c:68
-msgid "invalid packet"
-msgstr "無效的封包"
+#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+msgid "response does not contain the public key data\n"
+msgstr "回應中未包含公鑰資料\n"
 
-#: util/errors.c:69
-msgid "invalid armor"
-msgstr "無效的封裝"
+#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+msgid "response does not contain the RSA modulus\n"
+msgstr "回應中未包含 RSA 系數\n"
 
-#: util/errors.c:70
-msgid "no such user id"
-msgstr "沒有這個使用者 ID"
+#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+msgid "response does not contain the RSA public exponent\n"
+msgstr "回應中未包含 RSA 公用指數\n"
 
-#: util/errors.c:71
-msgid "secret key not available"
-msgstr "無法取用私鑰"
+#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2196
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "個人識別碼 (PIN) 收回時傳回錯誤: %s\n"
 
-#: util/errors.c:72
-msgid "wrong secret key used"
-msgstr "用了錯誤的私鑰"
+#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2202
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "用於 CHV %d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 
-#: util/errors.c:73
-msgid "not supported"
-msgstr "未被支援"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
+#: scd/app-openpgp.c:2211 scd/app-openpgp.c:2225
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "驗證 CHV %d 失敗: %s\n"
 
-#: util/errors.c:74
-msgid "bad key"
-msgstr "損壞的金鑰"
+#: scd/app-openpgp.c:1349
+msgid "access to admin commands is not configured\n"
+msgstr "取用管理者指令尚未被組態過\n"
 
-#: util/errors.c:75
-msgid "file read error"
-msgstr "檔案讀取錯誤"
+#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2435
+msgid "error retrieving CHV status from card\n"
+msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: util/errors.c:76
-msgid "file write error"
-msgstr "檔案寫入錯誤"
+#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2444
+msgid "card is permanently locked!\n"
+msgstr "卡片已被永久鎖住了!!\n"
 
-#: util/errors.c:77
-msgid "unknown compress algorithm"
-msgstr "未知的壓縮演算法"
+#: scd/app-openpgp.c:1375
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺留下來\n"
 
-#: util/errors.c:78
-msgid "file open error"
-msgstr "檔案開啟錯誤"
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1382
+msgid "|A|Admin PIN"
+msgstr "|A|Admin PIN"
 
-#: util/errors.c:79
-msgid "file create error"
-msgstr "檔案建立錯誤"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:1531
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
 
-#: util/errors.c:80
-msgid "invalid passphrase"
-msgstr "無效的密語"
+#: scd/app-openpgp.c:1531
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
 
-#: util/errors.c:81
-msgid "unimplemented pubkey algorithm"
-msgstr "未被採用的公鑰演算法"
+#: scd/app-openpgp.c:1535
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: util/errors.c:82
-msgid "unimplemented cipher algorithm"
-msgstr "未被採用的編密演算法"
+#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+msgid "error reading application data\n"
+msgstr "讀取應用程式資料時出錯\n"
 
-#: util/errors.c:83
-msgid "unknown signature class"
-msgstr "未知的簽章層級"
+#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+msgid "error reading fingerprint DO\n"
+msgstr "讀取指紋 DO 時出錯\n"
 
-#: util/errors.c:84
-msgid "trust database error"
-msgstr "信任資料庫錯誤"
+#: scd/app-openpgp.c:1601
+msgid "key already exists\n"
+msgstr "金鑰已存在\n"
 
-#: util/errors.c:85
-msgid "bad MPI"
-msgstr "損壞的 MPI"
+#: scd/app-openpgp.c:1605
+msgid "existing key will be replaced\n"
+msgstr "既有的金鑰將被取代\n"
 
-#: util/errors.c:86
-msgid "resource limit"
-msgstr "資源限制"
+#: scd/app-openpgp.c:1607
+msgid "generating new key\n"
+msgstr "正在產生新的金鑰\n"
 
-#: util/errors.c:87
-msgid "invalid keyring"
-msgstr "無效的鑰匙圈"
+#: scd/app-openpgp.c:1774
+msgid "creation timestamp missing\n"
+msgstr "建立的時間戳印缺漏\n"
 
-#: util/errors.c:88
-msgid "bad certificate"
-msgstr "損壞的憑證"
+#: scd/app-openpgp.c:1781
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA 模組缺漏或者尺寸並非 %d 位元\n"
 
-#: util/errors.c:89
-msgid "malformed user id"
-msgstr "被變造過的使用者 ID"
+#: scd/app-openpgp.c:1788
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: util/errors.c:90
-msgid "file close error"
-msgstr "檔案關閉錯誤"
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA 質數 %s 缺漏或者尺寸並非 %d 位元\n"
 
-#: util/errors.c:91
-msgid "file rename error"
-msgstr "檔案更名錯誤"
+#: scd/app-openpgp.c:1866
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "存放金鑰失敗: %s\n"
 
-#: util/errors.c:92
-msgid "file delete error"
-msgstr "檔案刪除錯誤"
+#: scd/app-openpgp.c:1925
+msgid "please wait while key is being generated ...\n"
+msgstr "公鑰正被產生中, 請稍候 ...\n"
 
-#: util/errors.c:93
-msgid "unexpected data"
-msgstr "未預期的資料"
+#: scd/app-openpgp.c:1939
+msgid "generating key failed\n"
+msgstr "產生金鑰時失敗\n"
 
-#: util/errors.c:94
-msgid "timestamp conflict"
-msgstr "時間戳印有矛盾"
+#: scd/app-openpgp.c:1942
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "金鑰產生已完工 (%d 秒)\n"
 
-#: util/errors.c:95
-msgid "unusable pubkey algorithm"
-msgstr "無法使用的公鑰演算法"
+#: scd/app-openpgp.c:1999
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "OpenPGP 卡片的格式無效 (DO 0x93)\n"
 
-#: util/errors.c:96
-msgid "file exists"
-msgstr "檔案已存在"
+#: scd/app-openpgp.c:2125
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: util/errors.c:97
-msgid "weak key"
-msgstr "金鑰薄弱"
+#: scd/app-openpgp.c:2176
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "目前建立的簽章: %lu\n"
 
-#: util/errors.c:98
-msgid "invalid argument"
-msgstr "無效的參數"
+#: scd/app-openpgp.c:2184
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: util/errors.c:99
-msgid "bad URI"
-msgstr "損壞的 URI"
+#: scd/app-openpgp.c:2449
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止了\n"
 
-#: util/errors.c:100
-msgid "unsupported URI"
-msgstr "未被支援的 URI"
+#: scd/app-openpgp.c:2522 scd/app-openpgp.c:2532
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 
-#: util/errors.c:101
-msgid "network error"
-msgstr "網路錯誤"
+#: scd/scdaemon.c:105
+msgid "run in multi server mode (foreground)"
+msgstr ""
 
-#: util/errors.c:103
-msgid "not encrypted"
-msgstr "未被加密"
+#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#, fuzzy
+msgid "read options from file"
+msgstr "從 `%s' 讀取選項\n"
 
-#: util/errors.c:104
-msgid "not processed"
-msgstr "未被處理"
+#: scd/scdaemon.c:121
+msgid "|N|connect to reader at port N"
+msgstr ""
 
-#: util/errors.c:106
-msgid "unusable public key"
-msgstr "不可用的公鑰"
+#: scd/scdaemon.c:122
+msgid "|NAME|use NAME as ct-API driver"
+msgstr ""
 
-#: util/errors.c:107
-msgid "unusable secret key"
-msgstr "不可用的私鑰"
+#: scd/scdaemon.c:123
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr ""
 
-#: util/errors.c:108
-msgid "keyserver error"
-msgstr "金鑰伺服器錯誤"
+#: scd/scdaemon.c:126
+msgid "do not use the internal CCID driver"
+msgstr ""
 
-#: util/errors.c:109
-msgid "canceled"
-msgstr "已取消"
+#: scd/scdaemon.c:131
+msgid "do not use a reader's keypad"
+msgstr ""
 
-#: util/errors.c:110
-msgid "no card"
-msgstr "沒有卡片"
+#: scd/scdaemon.c:132
+#, fuzzy
+msgid "allow the use of admin card commands"
+msgstr "顯示管理者指令"
 
-#: util/errors.c:111
+#: scd/scdaemon.c:191
 #, fuzzy
-msgid "no data"
-msgstr "沒有被簽署過的資料\n"
+msgid "Usage: scdaemon [options] (-h for help)"
+msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: util/logger.c:158
-msgid "ERROR: "
-msgstr "錯誤: "
+#: scd/scdaemon.c:193
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for GnuPG\n"
+msgstr ""
 
-#: util/logger.c:161
-msgid "WARNING: "
-msgstr "警告: "
+#: scd/scdaemon.c:667
+msgid "please use the option `--daemon' to run the program in the background\n"
+msgstr ""
 
-#: util/logger.c:224
+#: scd/scdaemon.c:1008
 #, c-format
-msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... 這是個瑕疵 (%s:%d:%s)\n"
+msgid "handler for fd %d started\n"
+msgstr ""
 
-#: util/logger.c:230
+#: scd/scdaemon.c:1013
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "妳找到一個瑕疵了 ... (%s:%d)\n"
+msgid "handler for fd %d terminated\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
-msgid "yes"
-msgstr "yes"
+#: sm/base64.c:318
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "無效的 64 進位字符 %02x 被跳過了\n"
 
-#: util/miscutil.c:331 util/miscutil.c:372
-msgid "yY"
-msgstr "yY"
+#: sm/call-dirmngr.c:182
+#, c-format
+msgid "no running dirmngr - starting `%s'\n"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
-msgid "no"
+#: sm/call-dirmngr.c:216
+#, fuzzy
+msgid "malformed DIRMNGR_INFO environment variable\n"
+msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
+
+#: sm/call-dirmngr.c:228
+#, fuzzy, c-format
+msgid "dirmngr protocol version %d is not supported\n"
+msgstr "gpg-agent 協定版本 %d 未被支援\n"
+
+#: sm/call-dirmngr.c:242
+msgid "can't connect to the dirmngr - trying fall back\n"
+msgstr ""
+
+#: sm/certchain.c:115
+#, fuzzy, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "gpg-agent 協定版本 %d 未被支援\n"
+
+#: sm/certchain.c:144
+msgid "issuer certificate is not marked as a CA"
+msgstr ""
+
+#: sm/certchain.c:182
+msgid "critical marked policy without configured policies"
+msgstr ""
+
+#: sm/certchain.c:192
+#, fuzzy, c-format
+msgid "failed to open `%s': %s\n"
+msgstr "無法開啟 `%s': %s\n"
+
+#: sm/certchain.c:199 sm/certchain.c:228
+msgid "note: non-critical certificate policy not allowed"
+msgstr ""
+
+#: sm/certchain.c:203 sm/certchain.c:232
+#, fuzzy
+msgid "certificate policy not allowed"
+msgstr "未被允許匯出私鑰\n"
+
+#: sm/certchain.c:343
+msgid "looking up issuer at external location\n"
+msgstr ""
+
+#: sm/certchain.c:363
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr ""
+
+#: sm/certchain.c:516 sm/certchain.c:680 sm/certchain.c:1118 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#, fuzzy
+msgid "failed to allocated keyDB handle\n"
+msgstr "存放金鑰失敗: %s\n"
+
+#: sm/certchain.c:607
+#, fuzzy
+msgid "certificate has been revoked"
+msgstr "請注意: 金鑰已經被撤銷了"
+
+#: sm/certchain.c:616
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "損壞的憑證"
+
+#: sm/certchain.c:620
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "可用的金鑰於: "
+
+#: sm/certchain.c:622
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr ""
+
+#: sm/certchain.c:627
+#, fuzzy, c-format
+msgid "checking the CRL failed: %s"
+msgstr "檢查已建立的簽章時發生錯誤: %s\n"
+
+#: sm/certchain.c:700
+#, fuzzy
+msgid "no issuer found in certificate"
+msgstr "產生一份撤銷憑證"
+
+#: sm/certchain.c:713
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr ""
+
+#: sm/certchain.c:729
+msgid "certificate not yet valid"
+msgstr ""
+
+#: sm/certchain.c:742
+#, fuzzy
+msgid "certificate has expired"
+msgstr "這把金鑰已經過期了!"
+
+#: sm/certchain.c:779
+msgid "self-signed certificate has a BAD signature"
+msgstr ""
+
+#: sm/certchain.c:844
+msgid "root certificate is not marked trusted"
+msgstr ""
+
+#: sm/certchain.c:855
+#, fuzzy, c-format
+msgid "fingerprint=%s\n"
+msgstr "憑證中心 (CA) 指紋: "
+
+#: sm/certchain.c:860
+msgid "root certificate has now been marked as trusted\n"
+msgstr ""
+
+#: sm/certchain.c:875
+#, fuzzy, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "檢查已建立的簽章時發生錯誤: %s\n"
+
+#: sm/certchain.c:901 sm/import.c:158
+msgid "certificate chain too long\n"
+msgstr ""
+
+#: sm/certchain.c:913
+msgid "issuer certificate not found"
+msgstr ""
+
+#: sm/certchain.c:946
+#, fuzzy
+msgid "certificate has a BAD signature"
+msgstr "驗證某份簽章"
+
+#: sm/certchain.c:976
+msgid "found another possible matching CA certificate - trying again"
+msgstr ""
+
+#: sm/certchain.c:999
+#, c-format
+msgid "certificate chain longer than allowed by CA (%d)"
+msgstr ""
+
+#: sm/certcheck.c:52
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
+
+#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189
+msgid "(this is the MD2 algorithm)\n"
+msgstr ""
+
+#: sm/certdump.c:61 sm/certdump.c:147
+#, fuzzy
+msgid "none"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
-msgid "nN"
-msgstr "nN"
+#: sm/certdump.c:156
+#, fuzzy
+msgid "[none]"
+msgstr "[未設定]"
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
-msgid "quit"
+#: sm/certdump.c:529 sm/certdump.c:592
+#, fuzzy
+msgid "[Error - invalid encoding]"
+msgstr "錯誤: 無效的回應.\n"
+
+#: sm/certdump.c:537
+msgid "[Error - out of core]"
+msgstr ""
+
+#: sm/certdump.c:572
+msgid "[Error - No name]"
+msgstr ""
+
+#: sm/certdump.c:597
+#, fuzzy
+msgid "[Error - invalid DN]"
+msgstr "錯誤: 無效的回應.\n"
+
+#: sm/certdump.c:758
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for:\n"
+"\"%s\"\n"
+"S/N %s, ID %08lX, created %s"
+msgstr ""
+"妳需要用密語來解開下列使用者的私鑰：\n"
+"\"%.*s\"\n"
+"%u 位元長的 %s 金鑰, ID %s, 建立於 %s%s\n"
+
+#: sm/certlist.c:123
+msgid "no key usage specified - assuming all usages\n"
+msgstr ""
+
+#: sm/certlist.c:133 sm/keylist.c:254
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
+
+#: sm/certlist.c:143
+msgid "certificate should have not been used for certification\n"
+msgstr ""
+
+#: sm/certlist.c:155
+msgid "certificate should have not been used for OCSP response signing\n"
+msgstr ""
+
+#: sm/certlist.c:166
+msgid "certificate should have not been used for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:167
+msgid "certificate should have not been used for signing\n"
+msgstr ""
+
+#: sm/certlist.c:168
+msgid "certificate is not usable for encryption\n"
+msgstr ""
+
+#: sm/certlist.c:169
+msgid "certificate is not usable for signing\n"
+msgstr ""
+
+#: sm/certreqgen.c:466
+#, fuzzy, c-format
+msgid "line %d: invalid algorithm\n"
+msgstr "無效的 `%s' 雜湊演算法\n"
+
+#: sm/certreqgen.c:479
+#, c-format
+msgid "line %d: invalid key length %u (valid are %d to %d)\n"
+msgstr ""
+
+#: sm/certreqgen.c:493
+#, c-format
+msgid "line %d: no subject name given\n"
+msgstr ""
+
+#: sm/certreqgen.c:501
+#, c-format
+msgid "line %d: invalid subject name label `%.*s'\n"
+msgstr ""
+
+#: sm/certreqgen.c:504
+#, c-format
+msgid "line %d: invalid subject name `%s' at pos %d\n"
+msgstr ""
+
+#: sm/certreqgen.c:520
+#, fuzzy, c-format
+msgid "line %d: not a valid email address\n"
+msgstr "不是有效的電子郵件地址\n"
+
+#: sm/certreqgen.c:532
+#, fuzzy, c-format
+msgid "line %d: error getting key by keygrip `%s': %s\n"
+msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
+
+#: sm/certreqgen.c:547
+#, fuzzy, c-format
+msgid "line %d: key generation failed: %s\n"
+msgstr "產生金鑰失敗: %s\n"
+
+#: sm/decrypt.c:326
+msgid "(this is the RC2 algorithm)\n"
+msgstr ""
+
+#: sm/decrypt.c:328
+msgid "(this does not seem to be an encrypted message)\n"
+msgstr ""
+
+#: sm/delete.c:52 sm/delete.c:103
+#, fuzzy, c-format
+msgid "certificate `%s' not found: %s\n"
+msgstr "找不到私鑰 \"%s\": %s\n"
+
+#: sm/delete.c:113 sm/keydb.c:1384 sm/keydb.c:1477
+#, fuzzy, c-format
+msgid "error locking keybox: %s\n"
+msgstr "讀取金鑰區塊時發生錯誤: %s\n"
+
+#: sm/delete.c:134
+#, fuzzy, c-format
+msgid "duplicated certificate `%s' deleted\n"
+msgstr "已建立撤銷憑證.\n"
+
+#: sm/delete.c:136
+#, fuzzy, c-format
+msgid "certificate `%s' deleted\n"
+msgstr "偏好設定 `%s' 重複了\n"
+
+#: sm/delete.c:166
+#, fuzzy, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "刪除金鑰區塊時失敗了: %s\n"
+
+#: sm/encrypt.c:333
+#, fuzzy
+msgid "no valid recipients given\n"
+msgstr "(沒有給定描述)\n"
+
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "建立密語的時候發生錯誤: %s\n"
+
+#: sm/export.c:569 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
+
+#: sm/gpgsm.c:244
+#, fuzzy
+msgid "|[FILE]|make a signature"
+msgstr "|[檔案]|建立一份簽章"
+
+#: sm/gpgsm.c:245
+#, fuzzy
+msgid "|[FILE]|make a clear text signature"
+msgstr "|[檔案]|建立一份明文簽章"
+
+#: sm/gpgsm.c:253
+#, fuzzy
+msgid "list external keys"
+msgstr "列出私鑰"
+
+#: sm/gpgsm.c:255
+#, fuzzy
+msgid "list certificate chain"
+msgstr "損壞的憑證"
+
+#: sm/gpgsm.c:258
+#, fuzzy
+msgid "remove key from the public keyring"
+msgstr "從公鑰鑰匙圈裡移去金鑰"
+
+#: sm/gpgsm.c:261
+#, fuzzy
+msgid "import certificates"
+msgstr "損壞的憑證"
+
+#: sm/gpgsm.c:262
+#, fuzzy
+msgid "export certificates"
+msgstr "損壞的憑證"
+
+#: sm/gpgsm.c:263
+#, fuzzy
+msgid "register a smartcard"
+msgstr "加入某把金鑰至智慧卡"
+
+#: sm/gpgsm.c:264
+msgid "run in server mode"
+msgstr ""
+
+#: sm/gpgsm.c:265
+msgid "pass a command to the dirmngr"
+msgstr ""
+
+#: sm/gpgsm.c:267
+msgid "invoke gpg-protect-tool"
+msgstr ""
+
+#: sm/gpgsm.c:268
+#, fuzzy
+msgid "change a passphrase"
+msgstr "更改密語"
+
+#: sm/gpgsm.c:282
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "建立以 ASCII 封裝過的輸出"
+
+#: sm/gpgsm.c:284
+msgid "assume input is in PEM format"
+msgstr ""
+
+#: sm/gpgsm.c:286
+msgid "assume input is in base-64 format"
+msgstr ""
+
+#: sm/gpgsm.c:288
+msgid "assume input is in binary format"
+msgstr ""
+
+#: sm/gpgsm.c:293
+msgid "use system's dirmngr if available"
+msgstr ""
+
+#: sm/gpgsm.c:294
+msgid "never consult a CRL"
+msgstr ""
+
+#: sm/gpgsm.c:301
+msgid "check validity using OCSP"
+msgstr ""
+
+#: sm/gpgsm.c:304
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:307
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:310
+msgid "do not check certificate policies"
+msgstr ""
+
+#: sm/gpgsm.c:314
+msgid "fetch missing issuer certificates"
+msgstr ""
+
+#: sm/gpgsm.c:318
+msgid "|NAME|use NAME as default recipient"
+msgstr ""
+
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "use the default key as default recipient"
+msgstr "已跳過: 公鑰已經被設成預設收件者\n"
+
+#: sm/gpgsm.c:337
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "force v3 signatures"
+msgstr "檢查簽章"
+
+#: sm/gpgsm.c:342
+msgid "always use a MDC for encryption"
+msgstr ""
+
+#: sm/gpgsm.c:347
+msgid "batch mode: never ask"
+msgstr ""
+
+#: sm/gpgsm.c:348
+msgid "assume yes on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:349
+msgid "assume no on most questions"
+msgstr ""
+
+#: sm/gpgsm.c:351
+#, fuzzy
+msgid "add this keyring to the list of keyrings"
+msgstr "從這個鑰匙圈裡取用金鑰"
+
+#: sm/gpgsm.c:352
+#, fuzzy
+msgid "add this secret keyring to the list"
+msgstr "要有私鑰纔能這麼做.\n"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
+#: sm/gpgsm.c:354
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr ""
+
+#: sm/gpgsm.c:355
+#, fuzzy
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|名字|以「名字」作為加密對象"
+
+#: sm/gpgsm.c:359
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: sm/gpgsm.c:374
+msgid "|FILE|load extension module FILE"
+msgstr ""
+
+#: sm/gpgsm.c:380
+#, fuzzy
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "未知的編密演算法"
+
+#: sm/gpgsm.c:382
+#, fuzzy
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "%s 簽章, 摘要演算法 %s\n"
+
+#: sm/gpgsm.c:384
+#, fuzzy
+msgid "|N|use compress algorithm N"
+msgstr "未知的壓縮演算法"
+
+#: sm/gpgsm.c:520
+#, fuzzy
+msgid "Usage: gpgsm [options] [files] (-h for help)"
+msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
+
+#: sm/gpgsm.c:523
+#, fuzzy
+msgid ""
+"Syntax: gpgsm [options] [files]\n"
+"sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"default operation depends on the input data\n"
+msgstr ""
+"語法: gpg [選項] [檔案]\n"
+"簽署, 檢查, 加密或解密\n"
+"預設的操作會依輸入資料而定\n"
+
+#: sm/gpgsm.c:617
+#, fuzzy
+msgid "usage: gpgsm [options] "
+msgstr "用法: gpg [選項] "
+
+#: sm/gpgsm.c:698
+#, fuzzy, c-format
+msgid "can't encrypt to `%s': %s\n"
+msgstr "無法連接至 `%s': %s\n"
+
+#: sm/gpgsm.c:772
+#, c-format
+msgid "libksba is too old (need %s, have %s)\n"
+msgstr ""
+
+#: sm/gpgsm.c:1252
+msgid "WARNING: running with faked system time: "
+msgstr ""
+
+#: sm/gpgsm.c:1317
+#, c-format
+msgid "importing common certificates `%s'\n"
+msgstr ""
+
+#: sm/gpgsm.c:1335
+#, fuzzy, c-format
+msgid "can't sign using `%s': %s\n"
+msgstr "無法存取 `%s': %s\n"
+
+#: sm/gpgsm.c:1519
+msgid "this command has not yet been implemented\n"
+msgstr ""
+
+#: sm/import.c:110
+#, fuzzy, c-format
+msgid "total number processed: %lu\n"
+msgstr "總共被處理的數量: %lu\n"
+
+#: sm/import.c:227
+#, fuzzy
+msgid "error storing certificate\n"
+msgstr "產生一份撤銷憑證"
+
+#: sm/import.c:235
+msgid "basic certificate checks failed - not imported\n"
+msgstr ""
+
+#: sm/import.c:421 sm/import.c:453
+#, fuzzy, c-format
+msgid "error importing certificate: %s\n"
+msgstr "建立密語的時候發生錯誤: %s\n"
+
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
+#, fuzzy, c-format
+msgid "error reading input: %s\n"
+msgstr "讀取 `%s' 時發生錯誤: %s\n"
+
+#: sm/keydb.c:190
+#, fuzzy, c-format
+msgid "error creating keybox `%s': %s\n"
+msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
+
+#: sm/keydb.c:193
+msgid "you may want to start the gpg-agent first\n"
+msgstr ""
+
+#: sm/keydb.c:198
+#, fuzzy, c-format
+msgid "keybox `%s' created\n"
+msgstr "鑰匙圈 `%s' 已建立\n"
+
+#: sm/keydb.c:1304 sm/keydb.c:1370
+#, fuzzy
+msgid "failed to get the fingerprint\n"
+msgstr "存放指紋失敗: %s\n"
+
+#: sm/keydb.c:1311 sm/keydb.c:1377
+#, fuzzy
+msgid "failed to allocate keyDB handle\n"
+msgstr "存放金鑰失敗: %s\n"
+
+#: sm/keydb.c:1332
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1340
+#, fuzzy, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
+
+#: sm/keydb.c:1348
+#, fuzzy, c-format
+msgid "error storing certificate: %s\n"
+msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
+
+#: sm/keydb.c:1392
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr ""
+
+#: sm/keydb.c:1401 sm/keydb.c:1489
+#, fuzzy, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
+
+#: sm/keydb.c:1410 sm/keydb.c:1500
+#, fuzzy, c-format
+msgid "error storing flags: %s\n"
+msgstr "讀取 `%s' 時發生錯誤: %s\n"
+
+#: sm/misc.c:57
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr ""
+
+#: sm/qualified.c:113
+#, fuzzy, c-format
+msgid "invalid formatted fingerprint in `%s', line %d\n"
+msgstr "錯誤: 指紋格式化無效.\n"
+
+#: sm/qualified.c:131
+#, c-format
+msgid "invalid country code in `%s', line %d\n"
+msgstr ""
+
+#: sm/qualified.c:224
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+
+#: sm/qualified.c:321
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"Note, that this certificate will NOT create a qualified signature!"
+msgstr ""
+
+#: sm/sign.c:444
+#, fuzzy, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "檢查已建立的簽章時發生錯誤: %s\n"
+
+#: sm/verify.c:388
+#, fuzzy
+msgid "Signature made "
+msgstr "由 %s 建立的簽章\n"
+
+#: sm/verify.c:392
+msgid "[date not given]"
+msgstr ""
+
+#: sm/verify.c:393
+#, c-format
+msgid " using certificate ID %08lX\n"
+msgstr ""
+
+#: sm/verify.c:506
+#, fuzzy
+msgid "Good signature from"
+msgstr "完好的簽章來自於 \"%s\""
+
+#: sm/verify.c:507
+#, fuzzy
+msgid "                aka"
+msgstr "                亦即 \"%s\""
+
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:183
+#, fuzzy
+msgid "quiet"
 msgstr "quit"
 
-#: util/miscutil.c:374
-msgid "qQ"
-msgstr "qQ"
+#: tools/gpg-connect-agent.c:61
+msgid "print data out hex encoded"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
-msgid "okay|okay"
-msgstr "okay|okay"
+#: tools/gpg-connect-agent.c:62
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr ""
 
-#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
-msgid "cancel|cancel"
-msgstr "cancel|cancel"
+#: tools/gpg-connect-agent.c:63
+msgid "run the Assuan server given on the command line"
+msgstr ""
 
-#: util/miscutil.c:410
-msgid "oO"
-msgstr "oO"
+#: tools/gpg-connect-agent.c:65
+msgid "do not use extended connect mode"
+msgstr ""
 
-#: util/miscutil.c:411
-msgid "cC"
-msgstr "cC"
+#: tools/gpg-connect-agent.c:126
+#, fuzzy
+msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: util/secmem.c:97
-msgid "WARNING: using insecure memory!\n"
-msgstr "警告: 正在使用不安全的記憶體!\n"
+#: tools/gpg-connect-agent.c:129
+msgid ""
+"Syntax: gpg-connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
 
-#: util/secmem.c:98
-msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
+#: tools/gpg-connect-agent.c:324
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:333
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:391
+#, fuzzy
+msgid "line too long - skipped\n"
+msgstr "列太長"
+
+#: tools/gpg-connect-agent.c:395
+msgid "line shortened due to embedded Nul character\n"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:457
+#, fuzzy, c-format
+msgid "unknown command `%s'\n"
+msgstr "未知的選項 `%s'\n"
+
+#: tools/gpg-connect-agent.c:465
+#, fuzzy, c-format
+msgid "sending line failed: %s\n"
+msgstr "簽署時失敗了: %s\n"
+
+#: tools/gpg-connect-agent.c:473
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "讀取公鑰時失敗: %s\n"
+
+#: tools/gpg-connect-agent.c:746
+#, fuzzy, c-format
+msgid "error sending %s command: %s\n"
+msgstr "讀取 `%s' 時發生錯誤: %s\n"
+
+#: tools/gpg-connect-agent.c:755
+#, fuzzy, c-format
+msgid "error sending standard options: %s\n"
+msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
+
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:693
+msgid "Options controlling the diagnostic output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:716
+msgid "Options controlling the configuration"
+msgstr ""
+
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:723
+msgid "Options useful for debugging"
+msgstr ""
+
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:731
+msgid "|FILE|write server mode logs to FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
+msgid "Options controlling the security"
+msgstr ""
+
+#: tools/gpgconf-comp.c:601
+msgid "Configuration for Keyservers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:606
+msgid "allow PKA lookups (DNS requests)"
+msgstr ""
+
+#: tools/gpgconf-comp.c:665
+msgid "do not check CRLs for root certificates"
+msgstr ""
+
+#: tools/gpgconf-comp.c:706
+msgid "Options controlling the format of the output"
+msgstr ""
+
+#: tools/gpgconf-comp.c:742
+msgid "Options controlling the interactivity and enforcement"
+msgstr ""
 
-#: util/secmem.c:351
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "尚未啟用安全的記憶體前, 不可能進行操作\n"
+#: tools/gpgconf-comp.c:752
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: tools/gpgconf-comp.c:763
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: tools/gpgconf-comp.c:768
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: tools/gpgconf-comp.c:805
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: tools/gpgconf.c:56
+msgid "list all components"
+msgstr ""
+
+#: tools/gpgconf.c:57
+msgid "|COMPONENT|list options"
+msgstr ""
+
+#: tools/gpgconf.c:58
+msgid "|COMPONENT|change options"
+msgstr ""
+
+#: tools/gpgconf.c:66
+msgid "activate changes at runtime, if possible"
+msgstr ""
+
+#: tools/gpgconf.c:89
+#, fuzzy
+msgid "Usage: gpgconf [options] (-h for help)"
+msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: util/secmem.c:352
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(也許妳選錯程式來做這件事了)\n"
+#: tools/gpgconf.c:92
+msgid ""
+"Syntax: gpgconf [options]\n"
+"Manage configuration options for tools of the GnuPG system\n"
+msgstr ""
+
+#: tools/gpgconf.c:176
+#, fuzzy
+msgid "usage: gpgconf [options] "
+msgstr "用法: gpg [選項] "
+
+#: tools/gpgconf.c:178
+msgid "Need one component argument"
+msgstr ""
+
+#: tools/gpgconf.c:187
+#, fuzzy
+msgid "Component not found"
+msgstr "找不到公鑰"
+
+#: tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
+
+#: tools/symcryptrun.c:170
+#, fuzzy
+msgid ""
+"@\n"
+"Commands:\n"
+" "
+msgstr ""
+"@指令:\n"
+" "
+
+#: tools/symcryptrun.c:172
+#, fuzzy
+msgid "decryption modus"
+msgstr "解密成功\n"
+
+#: tools/symcryptrun.c:173
+#, fuzzy
+msgid "encryption modus"
+msgstr "解密成功\n"
+
+#: tools/symcryptrun.c:177
+msgid "tool class (confucius)"
+msgstr ""
+
+#: tools/symcryptrun.c:178
+#, fuzzy
+msgid "program filename"
+msgstr "--store [檔名]"
+
+#: tools/symcryptrun.c:180
+msgid "secret key file (required)"
+msgstr ""
+
+#: tools/symcryptrun.c:181
+msgid "input file name (default stdin)"
+msgstr ""
+
+#: tools/symcryptrun.c:225
+#, fuzzy
+msgid "Usage: symcryptrun [options] (-h for help)"
+msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
+
+#: tools/symcryptrun.c:228
+msgid ""
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
+"Call a simple symmetric encryption tool\n"
+msgstr ""
+
+#: tools/symcryptrun.c:310
+#, fuzzy, c-format
+msgid "%s on %s aborted with status %i\n"
+msgstr "%s 不被允許跟 %s 併用\n"
+
+#: tools/symcryptrun.c:317
+#, fuzzy, c-format
+msgid "%s on %s failed with status %i\n"
+msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
+
+#: tools/symcryptrun.c:343
+#, fuzzy, c-format
+msgid "can't create temporary directory `%s': %s\n"
+msgstr "無法建立目錄 `%s': %s\n"
+
+#: tools/symcryptrun.c:383 tools/symcryptrun.c:400
+#, c-format
+msgid "could not open %s for writing: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:411
+#, fuzzy, c-format
+msgid "error writing to %s: %s\n"
+msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
+
+#: tools/symcryptrun.c:418
+#, fuzzy, c-format
+msgid "error reading from %s: %s\n"
+msgstr "讀取 `%s' 時發生錯誤: %s\n"
+
+#: tools/symcryptrun.c:425 tools/symcryptrun.c:432
+#, fuzzy, c-format
+msgid "error closing %s: %s\n"
+msgstr "在 `%s' 中出錯: %s\n"
+
+#: tools/symcryptrun.c:542
+#, fuzzy
+msgid "no --program option provided\n"
+msgstr "沒有已支援的遠端程式執行\n"
+
+#: tools/symcryptrun.c:548
+msgid "only --decrypt and --encrypt are supported\n"
+msgstr ""
+
+#: tools/symcryptrun.c:554
+msgid "no --keyfile option provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:565
+msgid "cannot allocate args vector\n"
+msgstr ""
+
+#: tools/symcryptrun.c:583
+#, fuzzy, c-format
+msgid "could not create pipe: %s\n"
+msgstr "無法建立 `%s': %s\n"
+
+#: tools/symcryptrun.c:590
+#, fuzzy, c-format
+msgid "could not create pty: %s\n"
+msgstr "無法建立 `%s': %s\n"
+
+#: tools/symcryptrun.c:606
+#, c-format
+msgid "could not fork: %s\n"
+msgstr ""
+
+#: tools/symcryptrun.c:634
+#, fuzzy, c-format
+msgid "execv failed: %s\n"
+msgstr "更新失敗: %s\n"
+
+#: tools/symcryptrun.c:663
+#, fuzzy, c-format
+msgid "select failed: %s\n"
+msgstr "刪除金鑰區塊時失敗了: %s\n"
+
+#: tools/symcryptrun.c:680
+#, fuzzy, c-format
+msgid "read failed: %s\n"
+msgstr "更新失敗: %s\n"
+
+#: tools/symcryptrun.c:732
+#, fuzzy, c-format
+msgid "pty read failed: %s\n"
+msgstr "更新失敗: %s\n"
+
+#: tools/symcryptrun.c:784
+#, fuzzy, c-format
+msgid "waitpid failed: %s\n"
+msgstr "更新失敗: %s\n"
+
+#: tools/symcryptrun.c:798
+#, c-format
+msgid "child aborted with status %i\n"
+msgstr ""
+
+#: tools/symcryptrun.c:853
+#, fuzzy, c-format
+msgid "cannot allocate infile string: %s\n"
+msgstr "無法建立備份檔案 `%s': %s\n"
+
+#: tools/symcryptrun.c:866
+#, fuzzy, c-format
+msgid "cannot allocate outfile string: %s\n"
+msgstr "無法建立備份檔案 `%s': %s\n"
+
+#: tools/symcryptrun.c:1041
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1061
+msgid "no class provided\n"
+msgstr ""
+
+#: tools/symcryptrun.c:1068
+#, fuzzy, c-format
+msgid "class %s is not supported\n"
+msgstr "保護摘要 %d 未被支援\n"
+
+#~ msgid "can't gen prime with pbits=%u qbits=%u\n"
+#~ msgstr "無法以 %u 位元長的 p 以及 %u 位元長的 q 產生質數\n"
+
+#~ msgid "can't generate a prime with less than %d bits\n"
+#~ msgstr "無法產生少於 %d 位元的質數\n"
+
+#~ msgid "no entropy gathering module detected\n"
+#~ msgstr "偵測不到亂數蒐集模組\n"
+
+#, fuzzy
+#~ msgid "can't lock `%s': %s\n"
+#~ msgstr "無法鎖定 `%s'\n"
+
+#, fuzzy
+#~ msgid "waiting for lock on `%s'...\n"
+#~ msgstr "正在將私鑰寫至 `%s'\n"
+
+#~ msgid "can't stat `%s': %s\n"
+#~ msgstr "無法取得檔案 `%s' 的資訊: %s\n"
+
+#~ msgid "`%s' is not a regular file - ignored\n"
+#~ msgstr "`%s' 不是一個標準的檔案 - 已略過\n"
+
+#~ msgid "note: random_seed file is empty\n"
+#~ msgstr "請注意: random_seed 檔案是空的\n"
+
+#~ msgid "WARNING: invalid size of random_seed file - not used\n"
+#~ msgstr "警告: random_seed 檔案大小無效 - 不予採用\n"
+
+#~ msgid "can't read `%s': %s\n"
+#~ msgstr "無法讀取 `%s': %s\n"
+
+#~ msgid "note: random_seed file not updated\n"
+#~ msgstr "請注意: random_seed 檔案未被更新\n"
+
+#~ msgid "can't write `%s': %s\n"
+#~ msgstr "無法寫入 `%s': %s\n"
+
+#~ msgid "can't close `%s': %s\n"
+#~ msgstr "無法關閉 `%s': %s\n"
+
+#~ msgid "WARNING: using insecure random number generator!!\n"
+#~ msgstr "警告: 正在使用不安全的隨機數字產生器!!\n"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "card reader not available\n"
+#~ msgstr "無法取用私鑰"
+
+#~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
+#~ msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 以取消: "
 
 #~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
-#~ msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
+#~ "Please remove the current card and insert the one with serial number:\n"
+#~ "   %.*s\n"
+#~ msgstr ""
+#~ "請移除現用中的卡片並插入下列序號的卡片:\n"
+#~ "   %.*s\n"
+
+#~ msgid "Hit return when ready or enter 'c' to cancel: "
+#~ msgstr "準備好時請按下 [Enter], 或者輸入 'c' 以取消: "
+
+#~ msgid "Enter New Admin PIN: "
+#~ msgstr "請輸入新的管理者個人識別碼 (PIN): "
+
+#~ msgid "Enter New PIN: "
+#~ msgstr "請輸入新的個人識別碼 (PIN): "
+
+#~ msgid "Enter Admin PIN: "
+#~ msgstr "請輸入管理者個人識別碼 (PIN): "
+
+#~ msgid "Enter PIN: "
+#~ msgstr "請輸入個人識別碼 (PIN): "
+
+#~ msgid "NOTE: %s is not available in this version\n"
+#~ msgstr "注意: %s 在本版中無法使用\n"
+
+#, fuzzy
+#~ msgid "         algorithms on these user IDs:\n"
+#~ msgstr "這些使用者 ID 上的演算法:\n"
+
+#~ msgid "general error"
+#~ msgstr "一般性錯誤"
+
+#~ msgid "unknown packet type"
+#~ msgstr "未知的封包型態"
+
+#~ msgid "unknown version"
+#~ msgstr "未知的版本"
+
+#~ msgid "unknown pubkey algorithm"
+#~ msgstr "未知的公鑰演算法"
 
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "使用者標記名稱一定要含有 '@' 字符\n"
+#~ msgid "unknown digest algorithm"
+#~ msgstr "未知的摘要演算法"
 
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
+#~ msgid "bad public key"
+#~ msgstr "損壞的公鑰"
 
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "標記值一定不能使用任何的控制字符\n"
+#~ msgid "bad secret key"
+#~ msgstr "損壞的私鑰"
 
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "警告: 找到無效的標記資料\n"
+#~ msgid "bad signature"
+#~ msgstr "損壞的簽章"
 
-#~ msgid "not human readable"
-#~ msgstr "不是人類能讀得懂的"
+#~ msgid "checksum error"
+#~ msgstr "加總檢查錯誤"
+
+#~ msgid "can't open the keyring"
+#~ msgstr "沒辦法開啟鑰匙圈"
+
+#~ msgid "invalid packet"
+#~ msgstr "無效的封包"
+
+#~ msgid "invalid armor"
+#~ msgstr "無效的封裝"
+
+#~ msgid "no such user id"
+#~ msgstr "沒有這個使用者 ID"
+
+#~ msgid "secret key not available"
+#~ msgstr "無法取用私鑰"
+
+#~ msgid "wrong secret key used"
+#~ msgstr "用了錯誤的私鑰"
+
+#~ msgid "not supported"
+#~ msgstr "未被支援"
+
+#~ msgid "bad key"
+#~ msgstr "損壞的金鑰"
+
+#~ msgid "file read error"
+#~ msgstr "檔案讀取錯誤"
+
+#~ msgid "file write error"
+#~ msgstr "檔案寫入錯誤"
+
+#~ msgid "file open error"
+#~ msgstr "檔案開啟錯誤"
+
+#~ msgid "file create error"
+#~ msgstr "檔案建立錯誤"
+
+#~ msgid "invalid passphrase"
+#~ msgstr "無效的密語"
+
+#~ msgid "unimplemented pubkey algorithm"
+#~ msgstr "未被採用的公鑰演算法"
+
+#~ msgid "unimplemented cipher algorithm"
+#~ msgstr "未被採用的編密演算法"
+
+#~ msgid "unknown signature class"
+#~ msgstr "未知的簽章層級"
+
+#~ msgid "trust database error"
+#~ msgstr "信任資料庫錯誤"
+
+#~ msgid "resource limit"
+#~ msgstr "資源限制"
+
+#~ msgid "invalid keyring"
+#~ msgstr "無效的鑰匙圈"
+
+#~ msgid "malformed user id"
+#~ msgstr "被變造過的使用者 ID"
+
+#~ msgid "file close error"
+#~ msgstr "檔案關閉錯誤"
+
+#~ msgid "file rename error"
+#~ msgstr "檔案更名錯誤"
+
+#~ msgid "file delete error"
+#~ msgstr "檔案刪除錯誤"
+
+#~ msgid "unexpected data"
+#~ msgstr "未預期的資料"
+
+#~ msgid "timestamp conflict"
+#~ msgstr "時間戳印有矛盾"
+
+#~ msgid "unusable pubkey algorithm"
+#~ msgstr "無法使用的公鑰演算法"
+
+#~ msgid "file exists"
+#~ msgstr "檔案已存在"
+
+#~ msgid "weak key"
+#~ msgstr "金鑰薄弱"
+
+#~ msgid "invalid argument"
+#~ msgstr "無效的參數"
+
+#~ msgid "bad URI"
+#~ msgstr "損壞的 URI"
+
+#~ msgid "unsupported URI"
+#~ msgstr "未被支援的 URI"
+
+#~ msgid "network error"
+#~ msgstr "網路錯誤"
+
+#~ msgid "not encrypted"
+#~ msgstr "未被加密"
+
+#~ msgid "not processed"
+#~ msgstr "未被處理"
+
+#~ msgid "unusable public key"
+#~ msgstr "不可用的公鑰"
+
+#~ msgid "unusable secret key"
+#~ msgstr "不可用的私鑰"
+
+#~ msgid "keyserver error"
+#~ msgstr "金鑰伺服器錯誤"
+
+#~ msgid "no card"
+#~ msgstr "沒有卡片"
+
+#, fuzzy
+#~ msgid "no data"
+#~ msgstr "沒有被簽署過的資料\n"
+
+#~ msgid "ERROR: "
+#~ msgstr "錯誤: "
+
+#~ msgid "WARNING: "
+#~ msgstr "警告: "
+
+#~ msgid "... this is a bug (%s:%d:%s)\n"
+#~ msgstr "... 這是個瑕疵 (%s:%d:%s)\n"
+
+#~ msgid "WARNING: using insecure memory!\n"
+#~ msgstr "警告: 正在使用不安全的記憶體!\n"
+
+#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
+#~ msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
+
+#~ msgid "operation is not possible without initialized secure memory\n"
+#~ msgstr "尚未啟用安全的記憶體前, 不可能進行操作\n"
+
+#~ msgid "(you may have used the wrong program for this task)\n"
+#~ msgstr "(也許妳選錯程式來做這件事了)\n"
 
 #~ 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"
-
-#~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
-#~ msgstr "DSA 要求使用 160 位元的雜湊演算法\n"